[releng] Move to EPL 2.0

* java files
* .propreties files
* .exsd
* .aj
* .html
* .genmodel
* .xtend
* feature
* add header to files without header

Change-Id: I7562b122f097204fc0bbfaaa90d8c318454e6b36
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
diff --git a/bundles/core/doc/org.eclipse.papyrus.moka.doc/about.html b/bundles/core/doc/org.eclipse.papyrus.moka.doc/about.html
index 3ce4e7e..4e81f03 100644
--- a/bundles/core/doc/org.eclipse.papyrus.moka.doc/about.html
+++ b/bundles/core/doc/org.eclipse.papyrus.moka.doc/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/doc/org.eclipse.papyrus.moka.doc/plugin.properties b/bundles/core/doc/org.eclipse.papyrus.moka.doc/plugin.properties
index 263bc79..a205ebe 100644
--- a/bundles/core/doc/org.eclipse.papyrus.moka.doc/plugin.properties
+++ b/bundles/core/doc/org.eclipse.papyrus.moka.doc/plugin.properties
@@ -1,9 +1,11 @@
 #################################################################################
 # Copyright (c) 2015 CEA LIST.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0.html/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/about.html
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Activator.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Activator.java
index 2efc227..ddf4527 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Activator.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/FUMLMultiThreadExecutionEngine.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/FUMLMultiThreadExecutionEngine.java
index 1d9523c..c040c0e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/FUMLMultiThreadExecutionEngine.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/FUMLMultiThreadExecutionEngine.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/Classes/Kernel/AsyncObject_.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/Classes/Kernel/AsyncObject_.java
index fbce2f8..953bba5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/Classes/Kernel/AsyncObject_.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/Classes/Kernel/AsyncObject_.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncEventPool.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncEventPool.java
index 8638445..9a99764 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncEventPool.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncEventPool.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncFIFOGetNextEventStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncFIFOGetNextEventStrategy.java
index ba5fcb2..c70294d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncFIFOGetNextEventStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncFIFOGetNextEventStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncGetNextEventStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncGetNextEventStrategy.java
index 75fc13e..7871ef9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncGetNextEventStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncGetNextEventStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncObjectActivation.java
index fbadf3d..48fa577 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/AsyncObjectActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/IAsyncEventPool.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/IAsyncEventPool.java
index 68d7609..e8f5e09 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/IAsyncEventPool.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/CommonBehaviors/Communications/IAsyncEventPool.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/Loci/LociL1/AsyncLocus.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/Loci/LociL1/AsyncLocus.java
index 2613d24..e6c692c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/Loci/LociL1/AsyncLocus.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/Semantics/Loci/LociL1/AsyncLocus.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/debug/AsyncDebug.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/debug/AsyncDebug.java
index d5f85bd..5adeb12 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/debug/AsyncDebug.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/debug/AsyncDebug.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/debug/TerminateSignalInstance.java b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/debug/TerminateSignalInstance.java
index 440b0af..7e410eb 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/debug/TerminateSignalInstance.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/src/org/eclipse/papyrus/moka/async/fuml/debug/TerminateSignalInstance.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/about.html
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Activator.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Activator.java
index 93feee0..5cc768c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Activator.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/Actions/IntermediateActions/ICS_ClearStructuralFeatureValueActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/Actions/IntermediateActions/ICS_ClearStructuralFeatureValueActionActivation.java
index ed821ab..1d37ff7 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/Actions/IntermediateActions/ICS_ClearStructuralFeatureValueActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/Actions/IntermediateActions/ICS_ClearStructuralFeatureValueActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/Classes/Kernel/ICS_OpaqueExpressionEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/Classes/Kernel/ICS_OpaqueExpressionEvaluation.java
index 563518b..fd19bef 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/Classes/Kernel/ICS_OpaqueExpressionEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/Classes/Kernel/ICS_OpaqueExpressionEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CommonBehaviors/BasicBehaviors/ICS_CallEventExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CommonBehaviors/BasicBehaviors/ICS_CallEventExecution.java
index ab69d79..9432519 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CommonBehaviors/BasicBehaviors/ICS_CallEventExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CommonBehaviors/BasicBehaviors/ICS_CallEventExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/InvocationActions/ICS_CallOperationActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/InvocationActions/ICS_CallOperationActionActivation.java
index e245a48..79579d5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/InvocationActions/ICS_CallOperationActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/InvocationActions/ICS_CallOperationActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/InvocationActions/ICS_EventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/InvocationActions/ICS_EventOccurrence.java
index f1fa95f..818d2b4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/InvocationActions/ICS_EventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/InvocationActions/ICS_EventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/CS_LinkKind.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/CS_LinkKind.java
index 0211977..1db46f9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/CS_LinkKind.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/CS_LinkKind.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_InteractionPoint.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_InteractionPoint.java
index f3dd3ca..7d7b5c9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_InteractionPoint.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_InteractionPoint.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Link.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Link.java
index 29931e5..80e11d0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Link.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Link.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Object.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Object.java
index c2f0e88..241a672 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Object.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Object.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Reference.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Reference.java
index fce41a0..36cc07c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Reference.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/Semantics/CompositeStructures/StructuredClasses/ICS_Reference.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/extensions/Semantics/CompositeStructures/StructuredClasses/ICS_ConnectorLink.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/extensions/Semantics/CompositeStructures/StructuredClasses/ICS_ConnectorLink.java
index 8dddef6..aac5731 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/extensions/Semantics/CompositeStructures/StructuredClasses/ICS_ConnectorLink.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/src/org/eclipse/papyrus/moka/composites/interfaces/extensions/Semantics/CompositeStructures/StructuredClasses/ICS_ConnectorLink.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.composites/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/about.html
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/InvocationActions/CS_DefaultConstructStrategyProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/InvocationActions/CS_DefaultConstructStrategyProfiler.aj
index 0f98694..410216e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/InvocationActions/CS_DefaultConstructStrategyProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/InvocationActions/CS_DefaultConstructStrategyProfiler.aj
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_ConnectorLinkWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_ConnectorLinkWrapper.java
index d15f4f6..afef507 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_ConnectorLinkWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_ConnectorLinkWrapper.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_InteractionPointWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_InteractionPointWrapper.java
index 6b40266..fe1f402 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_InteractionPointWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_InteractionPointWrapper.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.moka.composites.profiling.Semantics.CompositeStructures.StructuredClasses;
 
 import java.util.List;
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_ObjectProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_ObjectProfiler.aj
index 59d3df3..be4e8af 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_ObjectProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/aspects/org/eclipse/papyrus/moka/composites/profiling/Semantics/CompositeStructures/StructuredClasses/CS_ObjectProfiler.aj
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/CompleteActions/CS_ReadExtentActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/CompleteActions/CS_ReadExtentActionActivation.java
index d681ac4..074d1e0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/CompleteActions/CS_ReadExtentActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/CompleteActions/CS_ReadExtentActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_AddStructuralFeatureValueActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_AddStructuralFeatureValueActionActivation.java
index b587192..c16eff3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_AddStructuralFeatureValueActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_AddStructuralFeatureValueActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_ClearStructuralFeatureValueActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_ClearStructuralFeatureValueActionActivation.java
index 8b8bb48..9162730 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_ClearStructuralFeatureValueActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_ClearStructuralFeatureValueActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_CreateLinkActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_CreateLinkActionActivation.java
index ef1d535..6aa207f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_CreateLinkActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_CreateLinkActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_CreateObjectActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_CreateObjectActionActivation.java
index c71000b..a94156f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_CreateObjectActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_CreateObjectActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_ReadSelfActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_ReadSelfActionActivation.java
index 0088109..bc89474 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_ReadSelfActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_ReadSelfActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_RemoveStructuralFeatureValueActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_RemoveStructuralFeatureValueActionActivation.java
index 6e99cc5..267a764 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_RemoveStructuralFeatureValueActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Actions/IntermediateActions/CS_RemoveStructuralFeatureValueActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Classes/Kernel/CS_InstanceValueEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Classes/Kernel/CS_InstanceValueEvaluation.java
index c36ddb2..28c701d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Classes/Kernel/CS_InstanceValueEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Classes/Kernel/CS_InstanceValueEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Classes/Kernel/CS_OpaqueExpressionEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Classes/Kernel/CS_OpaqueExpressionEvaluation.java
index 91e4278..8475e99 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Classes/Kernel/CS_OpaqueExpressionEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Classes/Kernel/CS_OpaqueExpressionEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/BasicBehaviors/CS_CallEventExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/BasicBehaviors/CS_CallEventExecution.java
index 5b1f9be..a841b46 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/BasicBehaviors/CS_CallEventExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/BasicBehaviors/CS_CallEventExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_DispatchOperationOfInterfaceStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_DispatchOperationOfInterfaceStrategy.java
index 53573f2..99b6015 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_DispatchOperationOfInterfaceStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_DispatchOperationOfInterfaceStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_NameBased_StructuralFeatureOfInterfaceAccessStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_NameBased_StructuralFeatureOfInterfaceAccessStrategy.java
index dba72ad..b4de9b7 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_NameBased_StructuralFeatureOfInterfaceAccessStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_NameBased_StructuralFeatureOfInterfaceAccessStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_StructuralFeatureOfInterfaceAccessStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_StructuralFeatureOfInterfaceAccessStrategy.java
index 413b568..0b41257 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_StructuralFeatureOfInterfaceAccessStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CommonBehaviors/Communications/CS_StructuralFeatureOfInterfaceAccessStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_AcceptCallActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_AcceptCallActionActivation.java
index 7145119..df20f64 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_AcceptCallActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_AcceptCallActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_AcceptEventActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_AcceptEventActionActivation.java
index c6509fa..9df1e31 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_AcceptEventActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_AcceptEventActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_CallOperationActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_CallOperationActionActivation.java
index 5c5f985..6168f6f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_CallOperationActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_CallOperationActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_ConstructStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_ConstructStrategy.java
index 737ba49..c9f42d8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_ConstructStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_ConstructStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_DefaultConstructStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_DefaultConstructStrategy.java
index 1953858..828c0ea 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_DefaultConstructStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_DefaultConstructStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_DefaultRequestPropagationStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_DefaultRequestPropagationStrategy.java
index 0f41fe1..488d023 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_DefaultRequestPropagationStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_DefaultRequestPropagationStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_EventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_EventOccurrence.java
index 58e7ead..9ad9a3c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_EventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_EventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_RequestPropagationStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_RequestPropagationStrategy.java
index 36a7f04..ed80814 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_RequestPropagationStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_RequestPropagationStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_SendSignalActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_SendSignalActionActivation.java
index 9465b96..b366f4a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_SendSignalActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/InvocationActions/CS_SendSignalActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_InteractionPoint.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_InteractionPoint.java
index f10108e..313cc0b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_InteractionPoint.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_InteractionPoint.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Link.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Link.java
index 9c6c181..1ef2336 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Link.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Link.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Object.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Object.java
index 1495b82..9f35181 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Object.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Object.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Reference.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Reference.java
index c0d769e..bb58d80 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Reference.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/CompositeStructures/StructuredClasses/CS_Reference.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_ExecutionFactory.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_ExecutionFactory.java
index a1eb629..ffa6b4a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_ExecutionFactory.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_ExecutionFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_Executor.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_Executor.java
index a390dd5..cb14e49 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_Executor.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_Executor.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_Locus.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_Locus.java
index cf6a14b..5140adf 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_Locus.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/generated/org/eclipse/papyrus/moka/composites/Semantics/impl/Loci/LociL3/CS_Locus.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/Activator.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/Activator.java
index 191be18..cfb8320 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/Activator.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/CompositeStructuresExecutionEngine.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/CompositeStructuresExecutionEngine.java
index dc262ca..9d42471 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/CompositeStructuresExecutionEngine.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/CompositeStructuresExecutionEngine.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/extensions/Semantics/CompositeStructures/CS_NotNormativeDefaultConstructStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/extensions/Semantics/CompositeStructures/CS_NotNormativeDefaultConstructStrategy.java
index 6fc383d..a7e7d7f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/extensions/Semantics/CompositeStructures/CS_NotNormativeDefaultConstructStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/extensions/Semantics/CompositeStructures/CS_NotNormativeDefaultConstructStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/extensions/Semantics/InvocationActions/CS_ConnectorLink.java b/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/extensions/Semantics/InvocationActions/CS_ConnectorLink.java
index fdbbf8e..858c9d7 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/extensions/Semantics/InvocationActions/CS_ConnectorLink.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/src/org/eclipse/papyrus/moka/composites/extensions/Semantics/InvocationActions/CS_ConnectorLink.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/about.html
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/IObjectNodeActivationWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/IObjectNodeActivationWrapper.java
index 7d3d5a7..ea872c0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/IObjectNodeActivationWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/IObjectNodeActivationWrapper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/ITriggeredVisitorWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/ITriggeredVisitorWrapper.java
index 4e0ed13..9895f5c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/ITriggeredVisitorWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/ITriggeredVisitorWrapper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/Semantics/Kernel/Classes/IFeatureValueWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/Semantics/Kernel/Classes/IFeatureValueWrapper.java
index 29a418d..9cac4f1 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/Semantics/Kernel/Classes/IFeatureValueWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Profiling/Semantics/Kernel/Classes/IFeatureValueWrapper.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IActionActivation.java
index 1e5c97f..7c5fc92 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/ICallActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/ICallActionActivation.java
index d4bfd2b..d43aaba 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/ICallActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/ICallActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IInvocationActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IInvocationActionActivation.java
index 5f99542..ff0f988 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IInvocationActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IInvocationActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IOutputPinActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IOutputPinActivation.java
index 5df90c9..4b7a12e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IOutputPinActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IOutputPinActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IPinActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IPinActivation.java
index 5f01531..fec2f49 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IPinActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/BasicActions/IPinActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/CompleteActions/IAcceptEventActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/CompleteActions/IAcceptEventActionActivation.java
index c76b3d0..4d43365 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/CompleteActions/IAcceptEventActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/CompleteActions/IAcceptEventActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/CompleteActions/IAcceptEventActionEventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/CompleteActions/IAcceptEventActionEventAccepter.java
index b2ff7c7..ce1af6d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/CompleteActions/IAcceptEventActionEventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/CompleteActions/IAcceptEventActionEventAccepter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IDestroyObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IDestroyObjectActivation.java
index 335bc6c..3816877 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IDestroyObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IDestroyObjectActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/ILinkActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/ILinkActionActivation.java
index 4998a31..4ac1027 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/ILinkActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/ILinkActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IStructuralFeatureActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IStructuralFeatureActionActivation.java
index 33bce2b..62e92c7 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IStructuralFeatureActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IStructuralFeatureActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IWriteStructuralFeatureActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IWriteStructuralFeatureActionActivation.java
index 4f05819..2073f8e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IWriteStructuralFeatureActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Actions/IntermediateActions/IWriteStructuralFeatureActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activator.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activator.java
index d33e8cf..a7793ea 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activator.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IClauseActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IClauseActivation.java
index 5a28c06..ab4678a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IClauseActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IClauseActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IConditionalNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IConditionalNodeActivation.java
index 966ef19..4b2e6e8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IConditionalNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IConditionalNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/ILoopNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/ILoopNodeActivation.java
index 334b72b..ab85489 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/ILoopNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/ILoopNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IStructuredActivityNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IStructuredActivityNodeActivation.java
index 64dc437..3894573 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IStructuredActivityNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/CompleteStructuredActivities/IStructuredActivityNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionActivationGroup.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionActivationGroup.java
index e0b6548..d936f99 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionActivationGroup.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionActivationGroup.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionNodeActivation.java
index dcd2fd6..d3fd297 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionRegionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionRegionActivation.java
index 680120e..828f4b4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionRegionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/ExtraStructuredActivities/IExpansionRegionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityEdgeInstance.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityEdgeInstance.java
index ffe7292..2b4218c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityEdgeInstance.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityEdgeInstance.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityExecution.java
index c63e4c1..5d81144 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityFinalNode.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityFinalNode.java
index 47bcd50..37c4e71 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityFinalNode.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityFinalNode.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityNodeActivation.java
index 57c778d..7c23727 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityNodeActivationGroup.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityNodeActivationGroup.java
index b4e12b6..b551185 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityNodeActivationGroup.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityNodeActivationGroup.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityParameterNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityParameterNodeActivation.java
index f19b6d8..2e8254a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityParameterNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IActivityParameterNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IControlNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IControlNodeActivation.java
index 7a85db7..0f18aeb 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IControlNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IControlNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IDecisionNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IDecisionNodeActivation.java
index 98626d6..68adc27 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IDecisionNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IDecisionNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IFlowFinalNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IFlowFinalNodeActivation.java
index fbfcece..52839dd 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IFlowFinalNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IFlowFinalNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IForkNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IForkNodeActivation.java
index 580a925..a4784ff 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IForkNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IForkNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IForkedToken.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IForkedToken.java
index 19dc788..47973f8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IForkedToken.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IForkedToken.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IInitialNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IInitialNodeActivation.java
index 150dcc9..cd98203 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IInitialNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IInitialNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IJoinNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IJoinNodeActivation.java
index cd710bb..3714de1 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IJoinNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IJoinNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IMergeNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IMergeNodeActivation.java
index 034b35e..3d3e316 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IMergeNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IMergeNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IObjectNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IObjectNodeActivation.java
index 8128d9e..b685e1e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IObjectNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IObjectNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IObjectToken.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IObjectToken.java
index 15021a1..61cf733 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IObjectToken.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IObjectToken.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IOffer.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IOffer.java
index 79f3634..e5acf7d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IOffer.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IOffer.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IToken.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IToken.java
index 9f9143a..3f4b6cd 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IToken.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/IToken.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IBooleanValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IBooleanValue.java
index 4178c45..3e0af41 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IBooleanValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IBooleanValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ICompoundValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ICompoundValue.java
index ab84ff3..7628a58 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ICompoundValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ICompoundValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IDataValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IDataValue.java
index 7158023..c486d2b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IDataValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IDataValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IEnumerationValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IEnumerationValue.java
index 35f5882..c401607 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IEnumerationValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IEnumerationValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IEvaluation.java
index 9507519..6719d73 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IEvaluation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IExtensionalValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IExtensionalValue.java
index 782f26d..1e8c19e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IExtensionalValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IExtensionalValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IFeatureValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IFeatureValue.java
index 793564e..0f8c244 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IFeatureValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IFeatureValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IIntegerValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IIntegerValue.java
index 7d35ef8..9e83e7b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IIntegerValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IIntegerValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ILink.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ILink.java
index 3161047..45b4f2c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ILink.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ILink.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ILiteralEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ILiteralEvaluation.java
index ec511d5..4550056 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ILiteralEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/ILiteralEvaluation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IObject_.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IObject_.java
index ef1018e..37b408b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IObject_.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IObject_.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IPrimitiveValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IPrimitiveValue.java
index cd0a5be..ddd7198 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IPrimitiveValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IPrimitiveValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IRealValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IRealValue.java
index d57e027..b6857fd 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IRealValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IRealValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IReference.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IReference.java
index 1de11b1..b63c375 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IReference.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IReference.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IReturnInformation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IReturnInformation.java
index e4bdff6..d149093 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IReturnInformation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IReturnInformation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IStringValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IStringValue.java
index 376cf52..1a66f18 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IStringValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IStringValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IStructuredValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IStructuredValue.java
index d1bc511..762d0d0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IStructuredValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IStructuredValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IUnlimitedNaturalValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IUnlimitedNaturalValue.java
index 5de91ed..f5b8a6f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IUnlimitedNaturalValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IUnlimitedNaturalValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IValue.java
index e951050..dc159a6 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Classes/Kernel/IValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/ICallEventBehavior.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/ICallEventBehavior.java
index 2e34a7c..445cf55 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/ICallEventBehavior.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/ICallEventBehavior.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/ICallEventExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/ICallEventExecution.java
index cc59b37..d544392 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/ICallEventExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/ICallEventExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IExecution.java
index 994052f..40f9a62 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IOpaqueBehaviorExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IOpaqueBehaviorExecution.java
index b68be88..4899d46 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IOpaqueBehaviorExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IOpaqueBehaviorExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IParameterValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IParameterValue.java
index ef55e6d..2d8cf20 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IParameterValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/BasicBehaviors/IParameterValue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ICallEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ICallEventOccurrence.java
index d335edb..e01105d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ICallEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ICallEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IClassifierBehaviorExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IClassifierBehaviorExecution.java
index de4a827..6a1c875 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IClassifierBehaviorExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IClassifierBehaviorExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IClassifierBehaviorInvocationEventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IClassifierBehaviorInvocationEventAccepter.java
index 6d44296..3abbe45 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IClassifierBehaviorInvocationEventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IClassifierBehaviorInvocationEventAccepter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IEventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IEventAccepter.java
index 2dea389..4890f3f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IEventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IEventAccepter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IEventOccurrence.java
index 258fde9..4056321 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IInvocationEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IInvocationEventOccurrence.java
index 26ee7a3..870500f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IInvocationEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IInvocationEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IObjectActivation.java
index e34576b..00f6ed0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/IObjectActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ISignalEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ISignalEventOccurrence.java
index 469a81f..ffd4754 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ISignalEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ISignalEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ISignalInstance.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ISignalInstance.java
index 1c195c5..fc941a6 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ISignalInstance.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/CommonBehaviors/Communications/ISignalInstance.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IChoiceStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IChoiceStrategy.java
index 9d0706d..cf5fed1 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IChoiceStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IChoiceStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IExecutionFactory.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IExecutionFactory.java
index 65e91e2..263eee2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IExecutionFactory.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IExecutionFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IExecutor.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IExecutor.java
index 2492a60..34dfd45 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IExecutor.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/IExecutor.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ILocus.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ILocus.java
index d531aef..620ce41 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ILocus.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ILocus.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ISemanticStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ISemanticStrategy.java
index 8d05d81..50565df 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ISemanticStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ISemanticStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ISemanticVisitor.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ISemanticVisitor.java
index 0d52446..afa82b4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ISemanticVisitor.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/src/org/eclipse/papyrus/moka/fuml/Semantics/Loci/LociL1/ISemanticVisitor.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/build.properties
index dac14ed..d8572b6 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/build.properties
@@ -2,4 +2,5 @@
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/CommonBehavior/IEventTriggeredExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/CommonBehavior/IEventTriggeredExecution.java
index 50420fa..1b1933a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/CommonBehavior/IEventTriggeredExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/CommonBehavior/IEventTriggeredExecution.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/CommonBehavior/ISM_ObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/CommonBehavior/ISM_ObjectActivation.java
index f8d18ca..647793b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/CommonBehavior/ISM_ObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/CommonBehavior/ISM_ObjectActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ICompletionEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ICompletionEventOccurrence.java
index e603952..61a533c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ICompletionEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ICompletionEventOccurrence.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IConditionalPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IConditionalPseudostateActivation.java
index a1931e1..10f1b5f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IConditionalPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IConditionalPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IDeferredEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IDeferredEventOccurrence.java
index ce15773..58d725c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IDeferredEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IDeferredEventOccurrence.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IDoActivityContextObject.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IDoActivityContextObject.java
index 6c681dd..67e1174 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IDoActivityContextObject.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IDoActivityContextObject.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IHistoryPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IHistoryPseudostateActivation.java
index cfca1a7..e257ee6 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IHistoryPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IHistoryPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ILocalTransition.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ILocalTransition.java
index 568808d..709465f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ILocalTransition.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ILocalTransition.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IPseudostateActivation.java
index fb0e6ec..02c9019 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IRegionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IRegionActivation.java
index 1b3e8b1..5889563 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IRegionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IRegionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateActivation.java
index 11400e5..8ad1334 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateConfiguration.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateConfiguration.java
index 24d1c06..dc70840 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateConfiguration.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateConfiguration.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineConfiguration.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineConfiguration.java
index 816049a..2495c5b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineConfiguration.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineConfiguration.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineEventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineEventAccepter.java
index e0315b8..c39aa47 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineEventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineEventAccepter.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineExecution.java
index 94eab45..05de657 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineExecution.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineSemanticVisitor.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineSemanticVisitor.java
index 9f84d79..1bd84a0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineSemanticVisitor.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IStateMachineSemanticVisitor.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ITransitionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ITransitionActivation.java
index 52ef1b9..f811bc0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ITransitionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/ITransitionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IVertexActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IVertexActivation.java
index d880e44..7e3bcb8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IVertexActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/IVertexActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/StateMetadata.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/StateMetadata.java
index 5208992..3b105cf 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/StateMetadata.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/StateMetadata.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/TransitionMetadata.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/TransitionMetadata.java
index 6489555..6631ca8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/TransitionMetadata.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/StateMachines/TransitionMetadata.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/Values/ISM_OpaqueExpressionEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/Values/ISM_OpaqueExpressionEvaluation.java
index b9c8c27..db3957b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/Values/ISM_OpaqueExpressionEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/src/org/eclipse/papyrus/moka/fuml/statemachines/interfaces/Semantics/Values/ISM_OpaqueExpressionEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/about.html
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivationProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivationProfiler.aj
index 5464b15..30cf6da 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivationProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivationProfiler.aj
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.moka.fuml.statemachines.Semantics.StateMachines;
 
 import org.eclipse.papyrus.moka.engine.MokaExecutionEngineJob;
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivationWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivationWrapper.java
index 2e2d9ba..9de9407 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivationWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivationWrapper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/VertexActivationProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/VertexActivationProfiler.aj
index f1910ff..47a6c7a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/VertexActivationProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/aspects/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/VertexActivationProfiler.aj
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.moka.fuml.statemachines.Semantics.StateMachines;
 
 import org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications.IEventOccurrence;
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Activator.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Activator.java
index 3197802..7675390 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Activator.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Actions/IntermediateActions/SM_ReadSelfActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Actions/IntermediateActions/SM_ReadSelfActionActivation.java
index 16326d3..4f78802 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Actions/IntermediateActions/SM_ReadSelfActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Actions/IntermediateActions/SM_ReadSelfActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/CommonBehavior/EventTriggeredExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/CommonBehavior/EventTriggeredExecution.java
index 99d2c01..0a6d67f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/CommonBehavior/EventTriggeredExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/CommonBehavior/EventTriggeredExecution.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/CommonBehavior/SM_ObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/CommonBehavior/SM_ObjectActivation.java
index 75d3441..ef512ed 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/CommonBehavior/SM_ObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/CommonBehavior/SM_ObjectActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Loci/SM_ExecutionFactory.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Loci/SM_ExecutionFactory.java
index f54241a..ce90b77 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Loci/SM_ExecutionFactory.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Loci/SM_ExecutionFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Loci/SM_Locus.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Loci/SM_Locus.java
index e4a1fd8..d45ec7e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Loci/SM_Locus.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Loci/SM_Locus.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ChoicePseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ChoicePseudostateActivation.java
index 63742db..f626037 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ChoicePseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ChoicePseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/CompletionEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/CompletionEventOccurrence.java
index a9c463c..aa80c5e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/CompletionEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/CompletionEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ConditionalPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ConditionalPseudostateActivation.java
index 81ff937..97feed3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ConditionalPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ConditionalPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ConnectionPointActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ConnectionPointActivation.java
index bf07866..8f11041 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ConnectionPointActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ConnectionPointActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DeepHistoryPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DeepHistoryPseudostateActivation.java
index 17ea655..54130d8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DeepHistoryPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DeepHistoryPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DeferredEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DeferredEventOccurrence.java
index 6acf8b3..47be236 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DeferredEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DeferredEventOccurrence.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityContextObject.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityContextObject.java
index a9f16ca..3192c7d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityContextObject.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityContextObject.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST) - Based on Ed Seidewitz remarks
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityContextObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityContextObjectActivation.java
index 85ff6ed..ddbe09f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityContextObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityContextObjectActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityExecutionEventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityExecutionEventAccepter.java
index ba01415..a9a1b3d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityExecutionEventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/DoActivityExecutionEventAccepter.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST) - Based on Ed Seidewitz remarks
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/EntryPointPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/EntryPointPseudostateActivation.java
index afe6e0b..b5631f7 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/EntryPointPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/EntryPointPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ExitPointPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ExitPointPseudostateActivation.java
index 0a5bda3..ec003df 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ExitPointPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ExitPointPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ExternalTransitionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ExternalTransitionActivation.java
index 4a40818..4301582 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ExternalTransitionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ExternalTransitionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/FinalStateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/FinalStateActivation.java
index 63237f6..73a4d67 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/FinalStateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/FinalStateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ForkPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ForkPseudostateActivation.java
index e67bb3f..af8858b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ForkPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ForkPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/HistoryPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/HistoryPseudostateActivation.java
index 3f3f38f..ed9d6ce 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/HistoryPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/HistoryPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/InitialPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/InitialPseudostateActivation.java
index 4653c05..531a1b5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/InitialPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/InitialPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/InternalTransitionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/InternalTransitionActivation.java
index 980dd6f..cba7272 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/InternalTransitionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/InternalTransitionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/JoinPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/JoinPseudostateActivation.java
index 3b33d7b..d54fcbf 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/JoinPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/JoinPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/JunctionPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/JunctionPseudostateActivation.java
index b7180b6..2730e03 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/JunctionPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/JunctionPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/LocalTransitionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/LocalTransitionActivation.java
index 2553eed..b473d8d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/LocalTransitionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/LocalTransitionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/PseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/PseudostateActivation.java
index cd5c6f4..c4e09de 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/PseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/PseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/RegionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/RegionActivation.java
index 7ec4f7d..cec7074 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/RegionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/RegionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ShallowHistoryPseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ShallowHistoryPseudostateActivation.java
index ff593b6..e747af9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ShallowHistoryPseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/ShallowHistoryPseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateActivation.java
index 5690846..68bdfbc 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateConfiguration.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateConfiguration.java
index 8da663d..ab5acf3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateConfiguration.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateConfiguration.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineConfiguration.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineConfiguration.java
index fd58b56..c508023 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineConfiguration.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineConfiguration.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineEventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineEventAccepter.java
index 96cd1d3..ce80e51 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineEventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineEventAccepter.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST) - Based on Ed Seidewitz remarks
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineExecution.java
index e4d3e28..936cd2e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineExecution.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineSemanticVisitor.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineSemanticVisitor.java
index f3225db..fa49436 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineSemanticVisitor.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/StateMachineSemanticVisitor.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TerminatePseudostateActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TerminatePseudostateActivation.java
index ac0d1d3..2e63360 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TerminatePseudostateActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TerminatePseudostateActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivation.java
index 6d4dace..dc074c1 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/TransitionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/VertexActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/VertexActivation.java
index 6d74574..0afb432 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/VertexActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StateMachines/VertexActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StructuredClassifiers/SM_Object.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StructuredClassifiers/SM_Object.java
index 2802138..597a10d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StructuredClassifiers/SM_Object.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/StructuredClassifiers/SM_Object.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Values/SM_OpaqueExpressionEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Values/SM_OpaqueExpressionEvaluation.java
index 97195ba..eac50f4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Values/SM_OpaqueExpressionEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/Semantics/Values/SM_OpaqueExpressionEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/StateMachineExecutionEngine.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/StateMachineExecutionEngine.java
index 4ec042a..4e8d83e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/StateMachineExecutionEngine.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/src/org/eclipse/papyrus/moka/fuml/statemachines/StateMachineExecutionEngine.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/about.html
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/MokaObservable.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/MokaObservable.java
index e1ee86c..a9646cf 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/MokaObservable.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/MokaObservable.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/ObjectNodeActivationProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/ObjectNodeActivationProfiler.aj
index c8ba3dd..5b995bf 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/ObjectNodeActivationProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/ObjectNodeActivationProfiler.aj
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/ObjectNodeActivationWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/ObjectNodeActivationWrapper.java
index e8680bb..430b6a2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/ObjectNodeActivationWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/ObjectNodeActivationWrapper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/PinActivationProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/PinActivationProfiler.aj
index 6a7a892..bd69f96 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/PinActivationProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/BasicActions/PinActivationProfiler.aj
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/CompleteActions/AcceptEventActionActivationProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/CompleteActions/AcceptEventActionActivationProfiler.aj
index ed80a22..6a3deb2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/CompleteActions/AcceptEventActionActivationProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/CompleteActions/AcceptEventActionActivationProfiler.aj
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/CompleteActions/AcceptEventActivationWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/CompleteActions/AcceptEventActivationWrapper.java
index ca8891a..9ff3c83 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/CompleteActions/AcceptEventActivationWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Actions/CompleteActions/AcceptEventActivationWrapper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/ActivityEdgeInstanceProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/ActivityEdgeInstanceProfiler.aj
index c5344ee..263b365 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/ActivityEdgeInstanceProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/ActivityEdgeInstanceProfiler.aj
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/ActivityNodeActivationProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/ActivityNodeActivationProfiler.aj
index eab9ef4..9a4250f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/ActivityNodeActivationProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/ActivityNodeActivationProfiler.aj
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/CallActionActivationProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/CallActionActivationProfiler.aj
index 8ad3049..2742a45 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/CallActionActivationProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Activities/IntermediateActivities/CallActionActivationProfiler.aj
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Classes/Kernel/FeatureValueWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Classes/Kernel/FeatureValueWrapper.java
index d2f3ae9..dd31d32 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Classes/Kernel/FeatureValueWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Classes/Kernel/FeatureValueWrapper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/CommonBehaviors/Communications/ObjectActivationProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/CommonBehaviors/Communications/ObjectActivationProfiler.aj
index bdb233d..1490f25 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/CommonBehaviors/Communications/ObjectActivationProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/CommonBehaviors/Communications/ObjectActivationProfiler.aj
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.moka.fuml.profiling.Semantics.CommonBehaviors.Communications;
 
 import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.IReference;
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/CommonBehaviors/Communications/TriggeredVisitorWrapper.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/CommonBehaviors/Communications/TriggeredVisitorWrapper.java
index 734c7b8..9c4c096 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/CommonBehaviors/Communications/TriggeredVisitorWrapper.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/CommonBehaviors/Communications/TriggeredVisitorWrapper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/ExecutionFactoryProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/ExecutionFactoryProfiler.aj
index c52997f..44808ce 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/ExecutionFactoryProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/ExecutionFactoryProfiler.aj
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/LocusProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/LocusProfiler.aj
index 79de6de..3f5f0da 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/LocusProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/LocusProfiler.aj
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/SemanticVisitorProfiler.aj b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/SemanticVisitorProfiler.aj
index b8d11a3..f5c8569 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/SemanticVisitorProfiler.aj
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/SemanticVisitorProfiler.aj
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/ValueLifecycleObservable.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/ValueLifecycleObservable.java
index e2fadf5..25c47c0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/ValueLifecycleObservable.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/aspects/org/eclipse/papyrus/moka/fuml/profiling/Semantics/Loci/ValueLifecycleObservable.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/ActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/ActionActivation.java
index 1dd1765..5918b3a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/ActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/ActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallActionActivation.java
index 64204b6..a4be84f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallBehaviorActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallBehaviorActionActivation.java
index ec9b434..49b859a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallBehaviorActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallBehaviorActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallOperationActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallOperationActionActivation.java
index 713c72d..d52e075 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallOperationActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/CallOperationActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/InputPinActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/InputPinActivation.java
index 5998f92..45f7e0a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/InputPinActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/InputPinActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/InvocationActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/InvocationActionActivation.java
index d2b47ba..8b50b5b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/InvocationActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/InvocationActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/OutputPinActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/OutputPinActivation.java
index 8b1e7b7..b17c182 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/OutputPinActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/OutputPinActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/PinActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/PinActivation.java
index 67281d4..8c281bd 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/PinActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/PinActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/SendSignalActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/SendSignalActionActivation.java
index 0b8cca9..e0ed532 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/SendSignalActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/BasicActions/SendSignalActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptCallActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptCallActionActivation.java
index fef6a2b..95384be 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptCallActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptCallActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptEventActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptEventActionActivation.java
index 6459198..27783ac 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptEventActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptEventActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptEventActionEventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptEventActionEventAccepter.java
index 5d662c8..5788856 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptEventActionEventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/AcceptEventActionEventAccepter.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReadExtentActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReadExtentActionActivation.java
index 87b7286..07113ab 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReadExtentActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReadExtentActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReadIsClassifiedObjectActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReadIsClassifiedObjectActionActivation.java
index e00554d..072a045 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReadIsClassifiedObjectActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReadIsClassifiedObjectActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReclassifyObjectActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReclassifyObjectActionActivation.java
index 436370a..c4fd4c2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReclassifyObjectActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReclassifyObjectActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReduceActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReduceActionActivation.java
index 02f7892..90d767e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReduceActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReduceActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReplyActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReplyActionActivation.java
index 2e5ebe4..aaf3d24 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReplyActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/ReplyActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/StartClassifierBehaviorActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/StartClassifierBehaviorActionActivation.java
index f6556e5..6134e49 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/StartClassifierBehaviorActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/StartClassifierBehaviorActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/StartObjectBehaviorActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/StartObjectBehaviorActionActivation.java
index 7c633eb..dc0e78d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/StartObjectBehaviorActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/CompleteActions/StartObjectBehaviorActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/AddStructuralFeatureValueActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/AddStructuralFeatureValueActionActivation.java
index ab6c135..ee9fdeb 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/AddStructuralFeatureValueActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/AddStructuralFeatureValueActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ClearAssociationActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ClearAssociationActionActivation.java
index ae90b66..9a058cc 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ClearAssociationActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ClearAssociationActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ClearStructuralFeatureActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ClearStructuralFeatureActionActivation.java
index b517548..4f64cb4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ClearStructuralFeatureActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ClearStructuralFeatureActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateLinkActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateLinkActionActivation.java
index 7bcf3a5..518bf3f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateLinkActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateLinkActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateObjectActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateObjectActionActivation.java
index bb5cf95..ae4e39e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateObjectActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateObjectActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateObjectActionStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateObjectActionStrategy.java
index 94c5e76..e975505 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateObjectActionStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/CreateObjectActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DefaultCreateObjectActionStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DefaultCreateObjectActionStrategy.java
index a7a4eda..0b0ce95 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DefaultCreateObjectActionStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DefaultCreateObjectActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DefaultGetAssociationStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DefaultGetAssociationStrategy.java
index 0df4b2c..a2b739e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DefaultGetAssociationStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DefaultGetAssociationStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DestroyLinkActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DestroyLinkActionActivation.java
index 38804d5..976c967 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DestroyLinkActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DestroyLinkActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DestroyObjectActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DestroyObjectActionActivation.java
index 57a570b..c507ea8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DestroyObjectActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/DestroyObjectActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/GetAssociationStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/GetAssociationStrategy.java
index 3b17744..c369b69 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/GetAssociationStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/GetAssociationStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/LinkActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/LinkActionActivation.java
index 2cbb898..01b5936 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/LinkActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/LinkActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadLinkActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadLinkActionActivation.java
index 5afe701..644fea8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadLinkActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadLinkActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadSelfActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadSelfActionActivation.java
index aae973c..f19af3d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadSelfActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadSelfActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadStructuralFeatureActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadStructuralFeatureActionActivation.java
index f89bfcf..a70dc07 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadStructuralFeatureActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ReadStructuralFeatureActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/RemoveStructuralFeatureValueActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/RemoveStructuralFeatureValueActionActivation.java
index 72b88cc..2dce789 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/RemoveStructuralFeatureValueActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/RemoveStructuralFeatureValueActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/RestrictiveGetAssociationStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/RestrictiveGetAssociationStrategy.java
index 3aa802f..da546f8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/RestrictiveGetAssociationStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/RestrictiveGetAssociationStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/StructuralFeatureActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/StructuralFeatureActionActivation.java
index fdeaca0..f59ad0b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/StructuralFeatureActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/StructuralFeatureActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/TestIdentityActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/TestIdentityActionActivation.java
index 48ef2c0..3c70660 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/TestIdentityActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/TestIdentityActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ValueSpecificationActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ValueSpecificationActionActivation.java
index 1538ad1..fb4a369 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ValueSpecificationActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/ValueSpecificationActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/WriteLinkActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/WriteLinkActionActivation.java
index 91e9270..fc5cfed 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/WriteLinkActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/WriteLinkActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/WriteStructuralFeatureActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/WriteStructuralFeatureActionActivation.java
index 3598229..93b3a73 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/WriteStructuralFeatureActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Actions/IntermediateActions/WriteStructuralFeatureActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/ClauseActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/ClauseActivation.java
index 4d6d451..c2a2d9a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/ClauseActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/ClauseActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/ConditionalNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/ConditionalNodeActivation.java
index f351a3e..857dfb2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/ConditionalNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/ConditionalNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/DataStoreNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/DataStoreNodeActivation.java
index e8f09f8..99379df 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/DataStoreNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/DataStoreNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/LoopNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/LoopNodeActivation.java
index 42b3abb..69d3e37 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/LoopNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/LoopNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/StructuredActivityNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/StructuredActivityNodeActivation.java
index c73798d..cb1dfec 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/StructuredActivityNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/StructuredActivityNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/Values.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/Values.java
index 34cef8b..a877eec 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/Values.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/CompleteStructuredActivities/Values.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionActivationGroup.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionActivationGroup.java
index 25b8de3..3dbd8d0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionActivationGroup.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionActivationGroup.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionNodeActivation.java
index d7e186d..8f95258 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionRegionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionRegionActivation.java
index fd867d4..628708d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionRegionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/ExpansionRegionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/TokenSet.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/TokenSet.java
index ee37464..186d084 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/TokenSet.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/ExtraStructuredActivities/TokenSet.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityEdgeInstance.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityEdgeInstance.java
index 4c49060..a4b489a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityEdgeInstance.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityEdgeInstance.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityExecution.java
index 7ee04f0..b9a8849 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityExecution.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityFinalNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityFinalNodeActivation.java
index 6a02892..6c435b3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityFinalNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityFinalNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityNodeActivation.java
index e7dc31b..7250f7e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityNodeActivationGroup.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityNodeActivationGroup.java
index 0f315d2..6f372eb 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityNodeActivationGroup.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityNodeActivationGroup.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityParameterNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityParameterNodeActivation.java
index 5941882..aee4fba 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityParameterNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ActivityParameterNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/CentralBufferNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/CentralBufferNodeActivation.java
index 1347822..cbe06ad 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/CentralBufferNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/CentralBufferNodeActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ControlNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ControlNodeActivation.java
index f74bd81..ac692b1 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ControlNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ControlNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ControlToken.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ControlToken.java
index f0e5a1b..eab5a0c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ControlToken.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ControlToken.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/DecisionNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/DecisionNodeActivation.java
index 56de7ca..dbd6430 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/DecisionNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/DecisionNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/FlowFinalNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/FlowFinalNodeActivation.java
index 3fe15db..b16bc50 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/FlowFinalNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/FlowFinalNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ForkNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ForkNodeActivation.java
index 8e17220..42b814b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ForkNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ForkNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ForkedToken.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ForkedToken.java
index 7a30780..9577f73 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ForkedToken.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ForkedToken.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/InitialNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/InitialNodeActivation.java
index 1b509db..2b4e282 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/InitialNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/InitialNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/JoinNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/JoinNodeActivation.java
index 46520b2..dffec28 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/JoinNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/JoinNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/MergeNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/MergeNodeActivation.java
index a5ca17c..70574e3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/MergeNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/MergeNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ObjectNodeActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ObjectNodeActivation.java
index 5ae50c5..9fdb385 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ObjectNodeActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ObjectNodeActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ObjectToken.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ObjectToken.java
index ed246b9..fb582ea 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ObjectToken.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/ObjectToken.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/Offer.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/Offer.java
index ddfd432..8d24052 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/Offer.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/Offer.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/Token.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/Token.java
index 9fa970d..32ea642 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/Token.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Activities/IntermediateActivities/Token.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/BooleanValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/BooleanValue.java
index 3e44db0..3a91668 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/BooleanValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/BooleanValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/CompoundValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/CompoundValue.java
index 7eebfae..e72c55e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/CompoundValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/CompoundValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/DataValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/DataValue.java
index 984e858..3736cf2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/DataValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/DataValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/DispatchStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/DispatchStrategy.java
index 00eac9f..6c6c344 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/DispatchStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/DispatchStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/EnumerationValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/EnumerationValue.java
index 32fd907..c354733 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/EnumerationValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/EnumerationValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Evaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Evaluation.java
index 149d710..4256db0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Evaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Evaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/ExtensionalValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/ExtensionalValue.java
index 6e834e4..ca23ef1 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/ExtensionalValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/ExtensionalValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/FeatureValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/FeatureValue.java
index de30870..37eecb3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/FeatureValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/FeatureValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/InstanceValueEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/InstanceValueEvaluation.java
index ed9aff9..2a4e59d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/InstanceValueEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/InstanceValueEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/IntegerValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/IntegerValue.java
index db5043f..099609b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/IntegerValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/IntegerValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LimitedRedefinitionBasedDispatchStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LimitedRedefinitionBasedDispatchStrategy.java
index 81af9ee..bc7f0b5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LimitedRedefinitionBasedDispatchStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LimitedRedefinitionBasedDispatchStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Link.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Link.java
index 3c6dbda..2f92f2b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Link.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Link.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralBooleanEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralBooleanEvaluation.java
index bf79a42..0311855 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralBooleanEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralBooleanEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralEvaluation.java
index 4ae006c..a1add31 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralIntegerEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralIntegerEvaluation.java
index 67c0744..9198fe2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralIntegerEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralIntegerEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralNullEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralNullEvaluation.java
index 3926576..ac4c368 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralNullEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralNullEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralRealEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralRealEvaluation.java
index 6b62323..78e460b 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralRealEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralRealEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralStringEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralStringEvaluation.java
index 110a540..a18faeb 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralStringEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralStringEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralUnlimitedNaturalEvaluation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralUnlimitedNaturalEvaluation.java
index f11ec1e..dcfccc5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralUnlimitedNaturalEvaluation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/LiteralUnlimitedNaturalEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Object_.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Object_.java
index 6e6142a..2b2dea2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Object_.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Object_.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/PrimitiveValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/PrimitiveValue.java
index f87a5c4..382512a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/PrimitiveValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/PrimitiveValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/RealValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/RealValue.java
index d990846..6f2f7a6 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/RealValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/RealValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/RedefinitionBasedDispatchStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/RedefinitionBasedDispatchStrategy.java
index 4113d5b..5c570e5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/RedefinitionBasedDispatchStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/RedefinitionBasedDispatchStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Reference.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Reference.java
index 021ae1b..daa36e9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Reference.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Reference.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/ReturnInformation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/ReturnInformation.java
index 648329c..a725ccf 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/ReturnInformation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/ReturnInformation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/StringValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/StringValue.java
index fa833c8..28855a2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/StringValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/StringValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/StructuredValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/StructuredValue.java
index 85efde8..3cb847a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/StructuredValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/StructuredValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/UnlimitedNaturalValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/UnlimitedNaturalValue.java
index 6b2841b..56a5393 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/UnlimitedNaturalValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/UnlimitedNaturalValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Value.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Value.java
index a1863da..3f99dc4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Value.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Value.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/CallEventBehavior.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/CallEventBehavior.java
index 8192f10..dd62a04 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/CallEventBehavior.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/CallEventBehavior.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/CallEventExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/CallEventExecution.java
index 249b41c..5c29f51 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/CallEventExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/CallEventExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/Execution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/Execution.java
index 366ef40..c7b5bf4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/Execution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/Execution.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/OpaqueBehaviorExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/OpaqueBehaviorExecution.java
index dfa1a58..2f37c31 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/OpaqueBehaviorExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/OpaqueBehaviorExecution.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/ParameterValue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/ParameterValue.java
index bfeb7e6..9fac279 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/ParameterValue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/BasicBehaviors/ParameterValue.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ArrivalSignal.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ArrivalSignal.java
index b24b277..2374617 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ArrivalSignal.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ArrivalSignal.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/CallEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/CallEventOccurrence.java
index 2b815dd..540750a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/CallEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/CallEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ClassifierBehaviorExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ClassifierBehaviorExecution.java
index 5ce3ea0..74ab5a6 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ClassifierBehaviorExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ClassifierBehaviorExecution.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ClassifierBehaviorInvocationEventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ClassifierBehaviorInvocationEventAccepter.java
index 1466273..51684ca 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ClassifierBehaviorInvocationEventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ClassifierBehaviorInvocationEventAccepter.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/EventAccepter.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/EventAccepter.java
index 3e242b8..b5f7ef4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/EventAccepter.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/EventAccepter.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/EventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/EventOccurrence.java
index c36318e..1569e56 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/EventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/EventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/FIFOGetNextEventStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/FIFOGetNextEventStrategy.java
index 031ae42..21cf5bb 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/FIFOGetNextEventStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/FIFOGetNextEventStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/GetNextEventStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/GetNextEventStrategy.java
index 29d0845..5664d74 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/GetNextEventStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/GetNextEventStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/InvocationEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/InvocationEventOccurrence.java
index 9163f12..dcacd7c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/InvocationEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/InvocationEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ObjectActivation.java
index befb2a4..cdf6773 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/ObjectActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/SignalEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/SignalEventOccurrence.java
index 49f4700..40bf572 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/SignalEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/SignalEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/SignalInstance.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/SignalInstance.java
index 459ff79..bf80f27 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/SignalInstance.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/CommonBehaviors/Communications/SignalInstance.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ChoiceStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ChoiceStrategy.java
index 7928691..de5a5de 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ChoiceStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ChoiceStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ExecutionFactory.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ExecutionFactory.java
index 419916b..8754a09 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ExecutionFactory.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ExecutionFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ExecutionFactoryL1.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ExecutionFactoryL1.java
index 7532322..b3313e0 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ExecutionFactoryL1.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/ExecutionFactoryL1.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/Executor.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/Executor.java
index a67cc7d..84d9451 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/Executor.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/Executor.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/FirstChoiceStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/FirstChoiceStrategy.java
index ab8399e..83a65a7 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/FirstChoiceStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/FirstChoiceStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/Locus.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/Locus.java
index 51abb20..fbd0e11 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/Locus.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/Locus.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/SemanticStrategy.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/SemanticStrategy.java
index ebfd97e..dcbcc4f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/SemanticStrategy.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/SemanticStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/SemanticVisitor.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/SemanticVisitor.java
index 9b06310..02a0d86 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/SemanticVisitor.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL1/SemanticVisitor.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL2/ExecutionFactoryL2.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL2/ExecutionFactoryL2.java
index 0c97d53..1befa67 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL2/ExecutionFactoryL2.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL2/ExecutionFactoryL2.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL3/ExecutionFactoryL3.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL3/ExecutionFactoryL3.java
index 6844606..fb5d483 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL3/ExecutionFactoryL3.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Loci/LociL3/ExecutionFactoryL3.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/plugin.properties b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/plugin.properties
index e1dbbf6..3b58ef9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/plugin.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/plugin.properties
@@ -1,9 +1,11 @@
 #################################################################################
 # Copyright (c) 2015 CEA LIST.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0.html/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/schema/org.eclipse.papyrus.moka.fuml.library.exsd b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/schema/org.eclipse.papyrus.moka.fuml.library.exsd
index 476dd34..1a302a2 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/schema/org.eclipse.papyrus.moka.fuml.library.exsd
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/schema/org.eclipse.papyrus.moka.fuml.library.exsd
@@ -99,4 +99,26 @@
    </annotation>
 
 
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+ /*****************************************************************************
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
 </schema>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/schema/org.eclipse.papyrus.moka.fuml.services.exsd b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/schema/org.eclipse.papyrus.moka.fuml.services.exsd
index 1c70737..d87592e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/schema/org.eclipse.papyrus.moka.fuml.services.exsd
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/schema/org.eclipse.papyrus.moka.fuml.services.exsd
@@ -99,4 +99,24 @@
    </annotation>
 
 
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+ /*****************************************************************************
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
 </schema>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/Activator.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/Activator.java
index 8599543..6034a91 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/Activator.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java
index 289d80e..d726af4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/EventDispatchLoopExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/EventDispatchLoopExecution.java
index eecc3db..1939792 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/EventDispatchLoopExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/EventDispatchLoopExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/EventOccurrenceSendingExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/EventOccurrenceSendingExecution.java
index 18621e1..c226d93 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/EventOccurrenceSendingExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/EventOccurrenceSendingExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/RootExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/RootExecution.java
index e65daa7..445decd 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/RootExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/execution/RootExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionController.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionController.java
index bdfbe23..80e3809 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionController.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionController.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
 package org.eclipse.papyrus.moka.fuml.control.queue;
 
 import org.eclipse.papyrus.moka.fuml.control.execution.RootExecution;
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionLoop.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionLoop.java
index c910bf4..dcaa318 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionLoop.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionLoop.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionQueue.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionQueue.java
index 11c0ed3..03338dc 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionQueue.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/control/queue/ExecutionQueue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java
index 76aeb36..1c73e22 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/AbstractOpaqueBehaviorExecutionRegistry.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/AbstractOpaqueBehaviorExecutionRegistry.java
index b3d65d0..b91c966 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/AbstractOpaqueBehaviorExecutionRegistry.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/AbstractOpaqueBehaviorExecutionRegistry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/AbstractSystemServicesRegistry.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/AbstractSystemServicesRegistry.java
index 49d97b8..5fd40ca 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/AbstractSystemServicesRegistry.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/AbstractSystemServicesRegistry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/IOpaqueBehaviorExecutionRegistry.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/IOpaqueBehaviorExecutionRegistry.java
index db32054..bbc8919 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/IOpaqueBehaviorExecutionRegistry.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/IOpaqueBehaviorExecutionRegistry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/ISemanticStrategyRegistry.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/ISemanticStrategyRegistry.java
index 596a92f..048a389 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/ISemanticStrategyRegistry.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/ISemanticStrategyRegistry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/ISystemServicesRegistry.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/ISystemServicesRegistry.java
index 0d6d880..2559585 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/ISystemServicesRegistry.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/ISystemServicesRegistry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/SystemServicesRegistryUtils.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/SystemServicesRegistryUtils.java
index 1e377b3..618fd5d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/SystemServicesRegistryUtils.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/SystemServicesRegistryUtils.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractService.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractService.java
index 033edb3..8294eab 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractService.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractService.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractServiceFactory.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractServiceFactory.java
index 3c300d4..52a9244 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractServiceFactory.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractServiceFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractServicesRegistery.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractServicesRegistery.java
index 0f68518..629b675 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractServicesRegistery.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/AbstractServicesRegistery.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/IServiceFactory.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/IServiceFactory.java
index b7c373c..8dbe102 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/IServiceFactory.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/registry/service/framework/IServiceFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/build.properties
index dac14ed..d8572b6 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/build.properties
@@ -2,4 +2,5 @@
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/src/org/eclipse/papyrus/moka/timedfuml/interfaces/semantics/CommonBehaviors/ITimedEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/src/org/eclipse/papyrus/moka/timedfuml/interfaces/semantics/CommonBehaviors/ITimedEventOccurrence.java
index 0126ecf..83fd6ea 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/src/org/eclipse/papyrus/moka/timedfuml/interfaces/semantics/CommonBehaviors/ITimedEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/src/org/eclipse/papyrus/moka/timedfuml/interfaces/semantics/CommonBehaviors/ITimedEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Jeremie Tatibouet (CEA LIST)
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/src/org/eclipse/papyrus/moka/timedfuml/interfaces/semantics/CommonBehaviors/ITimedObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/src/org/eclipse/papyrus/moka/timedfuml/interfaces/semantics/CommonBehaviors/ITimedObjectActivation.java
index 82dfff9..89edc36 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/src/org/eclipse/papyrus/moka/timedfuml/interfaces/semantics/CommonBehaviors/ITimedObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/src/org/eclipse/papyrus/moka/timedfuml/interfaces/semantics/CommonBehaviors/ITimedObjectActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/about.html b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/about.html
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/Activator.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/Activator.java
index 7a3cbfb..d92c8ef 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/Activator.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/TimedUmlExecutionEngine.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/TimedUmlExecutionEngine.java
index 2bc0965..11452a7 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/TimedUmlExecutionEngine.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/TimedUmlExecutionEngine.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_displayCurrentTimeAction.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_displayCurrentTimeAction.java
index 1a29b94..d050db1 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_displayCurrentTimeAction.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_displayCurrentTimeAction.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_sendOfferAction.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_sendOfferAction.java
index 1db20d2..9ed9015 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_sendOfferAction.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_sendOfferAction.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_sendTimeEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_sendTimeEventOccurrence.java
index 2a667f6..f7c669a 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_sendTimeEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/actions/_sendTimeEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/control/queue/TimedExecutionLoop.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/control/queue/TimedExecutionLoop.java
index 65dbbbe..6f56719 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/control/queue/TimedExecutionLoop.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/control/queue/TimedExecutionLoop.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Actions/CompleteActions/TimedAcceptEventActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Actions/CompleteActions/TimedAcceptEventActionActivation.java
index 2820185..d39e096 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Actions/CompleteActions/TimedAcceptEventActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Actions/CompleteActions/TimedAcceptEventActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * 	Sahar Guermazi
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/CommonBehaviors/TimedEventOccurrence.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/CommonBehaviors/TimedEventOccurrence.java
index 2d0ec11..38cb000 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/CommonBehaviors/TimedEventOccurrence.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/CommonBehaviors/TimedEventOccurrence.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/CommonBehaviors/TimedObjectActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/CommonBehaviors/TimedObjectActivation.java
index a51e878..f98ab47 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/CommonBehaviors/TimedObjectActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/CommonBehaviors/TimedObjectActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Loci/TimedExecutionFactory.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Loci/TimedExecutionFactory.java
index 22a16f2..0a192ec 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Loci/TimedExecutionFactory.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Loci/TimedExecutionFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  * 	Sahar Guermazi
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Loci/TimedLocus.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Loci/TimedLocus.java
index a204915..77e6956 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Loci/TimedLocus.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Loci/TimedLocus.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StateMachines/TimedStateMachineConfiguration.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StateMachines/TimedStateMachineConfiguration.java
index f3fa040..05e4304 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StateMachines/TimedStateMachineConfiguration.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StateMachines/TimedStateMachineConfiguration.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StateMachines/TimedStateMachineExecution.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StateMachines/TimedStateMachineExecution.java
index a6e6b90..1ca0767 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StateMachines/TimedStateMachineExecution.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StateMachines/TimedStateMachineExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StructuredClassifiers/TimedObject.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StructuredClassifiers/TimedObject.java
index 88a22ec..11274e4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StructuredClassifiers/TimedObject.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/StructuredClassifiers/TimedObject.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Timed_OpaqueActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Timed_OpaqueActionActivation.java
index 366706a..e4e9599 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Timed_OpaqueActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Timed_OpaqueActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Timed_SendSignalActionActivation.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Timed_SendSignalActionActivation.java
index 478ee5e..371f626 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Timed_SendSignalActionActivation.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/semantics/Timed_SendSignalActionActivation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/utils/DESchedulerUtils.java b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/utils/DESchedulerUtils.java
index 294df08..e26c023 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/utils/DESchedulerUtils.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/src/org/eclipse/papyrus/moka/timedfuml/utils/DESchedulerUtils.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/about.html b/bundles/core/engines/org.eclipse.papyrus.moka/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/about.html
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/plugin.properties b/bundles/core/engines/org.eclipse.papyrus.moka/plugin.properties
index 770424f..516fc02 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/plugin.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/plugin.properties
@@ -1,9 +1,11 @@
 #################################################################################
 # Copyright (c) 2015 CEA LIST.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0.html/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/schema/engine.exsd b/bundles/core/engines/org.eclipse.papyrus.moka/schema/engine.exsd
index 198e2ac..aff6906 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/schema/engine.exsd
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/schema/engine.exsd
@@ -118,9 +118,11 @@
  *
  *    
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/Activator.java b/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/Activator.java
index f9e55a3..334518c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/Activator.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/AbstractExecutionEngine.java b/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/AbstractExecutionEngine.java
index cf77cdf..9f29300 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/AbstractExecutionEngine.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/AbstractExecutionEngine.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/IExecutionEngine.java b/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/IExecutionEngine.java
index 15a48cc..7f0a57e 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/IExecutionEngine.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/IExecutionEngine.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/MokaExecutionEngineJob.java b/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/MokaExecutionEngineJob.java
index 9418e85..5bfa20c 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/MokaExecutionEngineJob.java
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/engine/MokaExecutionEngineJob.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/about.html b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/about.html
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/Activator.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/Activator.java
index b030a14..0a6c80d 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/Activator.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/AssertionLibraryRegistery.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/AssertionLibraryRegistery.java
index 538e5b4..f4bfac7 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/AssertionLibraryRegistery.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/AssertionLibraryRegistery.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertEquals.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertEquals.java
index 39a13ed..c1856b8 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertEquals.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertEquals.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertFalse.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertFalse.java
index e041801..be612aa 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertFalse.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertFalse.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertList.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertList.java
index 5896bdc..8dea857 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertList.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertList.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertTrue.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertTrue.java
index 1beff87..5d35ecf 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertTrue.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/basic/AssertTrue.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/GenerateTestReport.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/GenerateTestReport.java
index d28778b..f5c476a 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/GenerateTestReport.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/GenerateTestReport.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/JUnit.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/JUnit.java
index 0631267..ff24b82 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/JUnit.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/JUnit.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/Reporter.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/Reporter.java
index f712ac9..d039e45 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/Reporter.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/Reporter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/TestDecision.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/TestDecision.java
index 522bdb9..dd84457 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/TestDecision.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/TestDecision.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/TestReport.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/TestReport.java
index f9a4ea3..3361c48 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/TestReport.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/reporting/TestReport.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/utils/AssertionExecutionContextHelper.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/utils/AssertionExecutionContextHelper.java
index 8eb3e83..b37be66 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/utils/AssertionExecutionContextHelper.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/utils/AssertionExecutionContextHelper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/utils/ReportNameSingleton.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/utils/ReportNameSingleton.java
index 7874973..99f04a6 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/utils/ReportNameSingleton.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/src/org/eclipse/papyrus/moka/fuml/assertionlibrary/utils/ReportNameSingleton.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/about.html b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/about.html
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties
index 07b6d6e..cc548cc 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties
@@ -1,9 +1,11 @@
 #################################################################################
 # Copyright (c) 2015 CEA LIST.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0.html/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/Activator.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/Activator.java
index fa2e779..1b5d00c 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/Activator.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java
index 7b33d39..3dd6016 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardServicesRegistry.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardServicesRegistry.java
index a65ef6c..ea9e882 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardServicesRegistry.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardServicesRegistry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/And.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/And.java
index c2dd681..d09a8d8 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/And.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/And.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Implies.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Implies.java
index 1c0b615..bdcc5dd 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Implies.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Implies.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Not.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Not.java
index af56651..d70a5a0 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Not.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Not.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Or.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Or.java
index 918fd89..095c7d4 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Or.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Or.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToBoolean.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToBoolean.java
index cf4186f..9f17ebb 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToBoolean.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToBoolean.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToString.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToString.java
index 3fa9b9b..85e9673 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToString.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToString.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Xor.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Xor.java
index 53a986b..412d285 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Xor.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Xor.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Abs.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Abs.java
index 3548090..0c0a3a7 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Abs.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Abs.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Add.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Add.java
index 2153532..cb4dfa2 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Add.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Add.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div.java
index 58208fc..7aa8998 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div_.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div_.java
index d512742..c467ebf 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div_.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div_.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Greater.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Greater.java
index 7e80bb0..1ee77a8 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Greater.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Greater.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/GreaterOrEqual.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/GreaterOrEqual.java
index 7b8bfd4..ebd63da 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/GreaterOrEqual.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/GreaterOrEqual.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Lower.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Lower.java
index 125f69a..2a3b6b3 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Lower.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Lower.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/LowerOrEqual.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/LowerOrEqual.java
index e644fad..05d13e4 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/LowerOrEqual.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/LowerOrEqual.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Max.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Max.java
index 3340bbf..bc99208 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Max.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Max.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Min.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Min.java
index 754daeb..02eb5d7 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Min.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Min.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Minus.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Minus.java
index 73f8956..b47c07b 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Minus.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Minus.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Mod.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Mod.java
index 3a2753c..e383c9a 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Mod.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Mod.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Neg.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Neg.java
index b2aab3f..531af2f 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Neg.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Neg.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Times.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Times.java
index 6d80fe8..afb7cf0 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Times.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Times.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToInteger.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToInteger.java
index 19641c9..d2801d5 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToInteger.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToInteger.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToString.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToString.java
index ec4bbb8..cea082c 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToString.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToString.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToUnlimitedNatural.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToUnlimitedNatural.java
index df22429..0b612c5 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToUnlimitedNatural.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToUnlimitedNatural.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl.java
index 531747a..c044062 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl.java
index dcf3502..c9965ec 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListConcat.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListConcat.java
index aaa0491..8fa7c35 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListConcat.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListConcat.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListGet.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListGet.java
index fd00354..31b3ed8 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListGet.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListGet.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListSize.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListSize.java
index bfee742..d938743 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListSize.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListSize.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Abs.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Abs.java
index 4e8530a..32a818a 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Abs.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Abs.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Add.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Add.java
index 9144c14..96bdf92 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Add.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Add.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Div.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Div.java
index d9e8432..53bfbee 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Div.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Div.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Floor.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Floor.java
index 5dbea77..2e9c639 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Floor.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Floor.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Greater.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Greater.java
index 4e49962..c980717 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Greater.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Greater.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/GreaterOrEqual.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/GreaterOrEqual.java
index 6a8ec4f..c85c5d5 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/GreaterOrEqual.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/GreaterOrEqual.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Inv.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Inv.java
index 1792582..16b6b31 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Inv.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Inv.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Lower.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Lower.java
index a75487e..c38b274 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Lower.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Lower.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/LowerOrEqual.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/LowerOrEqual.java
index bfd2643..c2cdcd2 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/LowerOrEqual.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/LowerOrEqual.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Max.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Max.java
index e527364..e631a55 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Max.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Max.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Min.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Min.java
index 8da5270..768edd1 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Min.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Min.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Minus.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Minus.java
index c3eb47e..26611a0 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Minus.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Minus.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Neg.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Neg.java
index cfb99be..a2e6874 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Neg.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Neg.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Round.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Round.java
index 28189c8..df5ad4f 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Round.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Round.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Times.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Times.java
index ffed537..304be99 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Times.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/Times.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToInteger.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToInteger.java
index 60d45da..9b73de0 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToInteger.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToInteger.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToReal.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToReal.java
index 2865d27..168ed2c 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToReal.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToReal.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToString.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToString.java
index d579777..db2d8af 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToString.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/real/ToString.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Concat.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Concat.java
index f733ff6..b52936b 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Concat.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Concat.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Size.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Size.java
index 98e866f..5c61867 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Size.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Size.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Substring.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Substring.java
index 23c7ed1..6944bdb 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Substring.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Substring.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Greater.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Greater.java
index 77aaec0..e0b81d6 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Greater.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Greater.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/GreaterOrEqual.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/GreaterOrEqual.java
index 5baf24a..88ac273 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/GreaterOrEqual.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/GreaterOrEqual.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Lower.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Lower.java
index e6fae27..175c48c 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Lower.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Lower.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/LowerOrEqual.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/LowerOrEqual.java
index 06e2f64..53300fa 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/LowerOrEqual.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/LowerOrEqual.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Max.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Max.java
index 50c7601..86a0436 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Max.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Max.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Min.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Min.java
index b2fed4b..a94f384 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Min.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Min.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToInteger.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToInteger.java
index 757307d..108bead 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToInteger.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToInteger.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToString.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToString.java
index 9a5e7ed..cca993d 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToString.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToString.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToUnlimitedNatural.java b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToUnlimitedNatural.java
index a4ec4f1..dfb5901 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToUnlimitedNatural.java
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToUnlimitedNatural.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/about.html b/bundles/core/services/org.eclipse.papyrus.moka.animation/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/about.html
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/schema/animator.exsd b/bundles/core/services/org.eclipse.papyrus.moka.animation/schema/animator.exsd
index 2201ac7..1c20ea6 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/schema/animator.exsd
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/schema/animator.exsd
@@ -142,4 +142,25 @@
    </annotation>
 
 
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+ /*****************************************************************************
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
 </schema>
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/AnimationPlugin.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/AnimationPlugin.java
index 062df21..3669792 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/AnimationPlugin.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/AnimationPlugin.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/css/AnimationPseudoSelectorMappingProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/css/AnimationPseudoSelectorMappingProvider.java
index 11feac3..8ad4056 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/css/AnimationPseudoSelectorMappingProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/css/AnimationPseudoSelectorMappingProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/AnimationService.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/AnimationService.java
index ffd6be3..198231b 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/AnimationService.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/AnimationService.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/ActivityAnimator.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/ActivityAnimator.java
index 7b27d8a..1d092bc 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/ActivityAnimator.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/ActivityAnimator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/Animator.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/Animator.java
index 7b2bf6b..1ca1b20 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/Animator.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/Animator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/AnimatorExtensionEvaluator.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/AnimatorExtensionEvaluator.java
index ce410a3..3da00df 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/AnimatorExtensionEvaluator.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/AnimatorExtensionEvaluator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/StateMachineAnimator.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/StateMachineAnimator.java
index 7239c4a..d051ee8 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/StateMachineAnimator.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/StateMachineAnimator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/StructuralAnimator.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/StructuralAnimator.java
index fecfcb3..dcfaefd 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/StructuralAnimator.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/StructuralAnimator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/actions/DerivedAnimationAction.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/actions/DerivedAnimationAction.java
index 41681a4..95f44c9 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/actions/DerivedAnimationAction.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/animators/actions/DerivedAnimationAction.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
+ */
 package org.eclipse.papyrus.moka.animation.engine.animators.actions;
 
 import org.eclipse.papyrus.moka.animation.engine.rendering.IRenderingEngine;
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationEngine.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationEngine.java
index 37fed61..b8db1df 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationEngine.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationEngine.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationKind.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationKind.java
index 79d3cfc..cedec9f 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationKind.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/AnimationKind.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/DiagramHandler.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/DiagramHandler.java
index 6e10290..4cc0738 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/DiagramHandler.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/DiagramHandler.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/IAnimation.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/IAnimation.java
index 67cd82c..f8f09bd 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/IAnimation.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/IAnimation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/IRenderingEngine.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/IRenderingEngine.java
index f0a02c4..6cd3a55 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/IRenderingEngine.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/engine/rendering/IRenderingEngine.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatedDiagramTreeContentProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatedDiagramTreeContentProvider.java
index 40ba2b5..ccacaac 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatedDiagramTreeContentProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatedDiagramTreeContentProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatingInstanceLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatingInstanceLabelProvider.java
index 92e1cb6..cf35c10 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatingInstanceLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatingInstanceLabelProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationControlView.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationControlView.java
index 71d3b73..0f49b79 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationControlView.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationControlView.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationControlViewFilter.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationControlViewFilter.java
index a5580cd..715648a 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationControlViewFilter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationControlViewFilter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationEditingSupport.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationEditingSupport.java
index 94b5301..b5df698 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationEditingSupport.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimationEditingSupport.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatorRightLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatorRightLabelProvider.java
index f314b1d..f0be97d 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatorRightLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/AnimatorRightLabelProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/MainColumnLableProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/MainColumnLableProvider.java
index f4723ca..4a7774f 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/MainColumnLableProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/MainColumnLableProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/RootLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/RootLabelProvider.java
index ef6b190..d883613 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/RootLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/control/RootLabelProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimatedDiagramTree.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimatedDiagramTree.java
index caa4777..fef71b5 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimatedDiagramTree.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimatedDiagramTree.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimatingInstanceNode.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimatingInstanceNode.java
index 446fad2..8c512db 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimatingInstanceNode.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimatingInstanceNode.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimationTreeNode.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimationTreeNode.java
index 7f864ed..e6638ff 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimationTreeNode.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimationTreeNode.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimationTreeNodeFactory.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimationTreeNodeFactory.java
index 256da73..653c250 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimationTreeNodeFactory.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/AnimationTreeNodeFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/DiagramAnimationNode.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/DiagramAnimationNode.java
index a9a450f..767af1f 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/DiagramAnimationNode.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/DiagramAnimationNode.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/IAnimationTreeNode.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/IAnimationTreeNode.java
index 09493b9..623dec4 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/IAnimationTreeNode.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/IAnimationTreeNode.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/IContentProviderListener.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/IContentProviderListener.java
index 29bb6fc..fa6c7d6 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/IContentProviderListener.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/presentation/data/IContentProviderListener.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/utils/AnimationUtils.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/utils/AnimationUtils.java
index fcd32d4..3dd610a 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/utils/AnimationUtils.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/utils/AnimationUtils.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/utils/EditorUtils.java b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/utils/EditorUtils.java
index 2cd012b..6e17107 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/utils/EditorUtils.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/src/org/eclipse/papyrus/moka/animation/utils/EditorUtils.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/about.html b/bundles/core/services/org.eclipse.papyrus.moka.debug/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/about.html
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/MokaDebugPlugin.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/MokaDebugPlugin.java
index 6edf8dc..ffe76e4 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/MokaDebugPlugin.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/MokaDebugPlugin.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/breakpoint/MokaBreakpoint.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/breakpoint/MokaBreakpoint.java
index dd85dd5..6ae4414 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/breakpoint/MokaBreakpoint.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/breakpoint/MokaBreakpoint.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/DebugService.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/DebugService.java
index d074736..d0e3a62 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/DebugService.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/DebugService.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/DebugServiceHelper.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/DebugServiceHelper.java
index 8ab98a4..ca800c0 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/DebugServiceHelper.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/DebugServiceHelper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/IMokaDebugTarget.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/IMokaDebugTarget.java
index 80b3709..0d57db0 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/IMokaDebugTarget.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/IMokaDebugTarget.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/IMokaThread.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/IMokaThread.java
index 7172890..d3de5ff 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/IMokaThread.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/IMokaThread.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugElement.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugElement.java
index 097333e..1670176 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugElement.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugElement.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugTarget.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugTarget.java
index 18bd692..652d3c4 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugTarget.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugTarget.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugTargetState.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugTargetState.java
index d8785a8..16e6328 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugTargetState.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaDebugTargetState.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaProcess.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaProcess.java
index 3d5d7d0..495fbef 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaProcess.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaProcess.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaThread.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaThread.java
index 48592f8..474cbfb 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaThread.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaThread.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaThreadState.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaThreadState.java
index 5480369..6e29459 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaThreadState.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/engine/MokaThreadState.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/MokaStackFrame.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/MokaStackFrame.java
index 0d3bd9a..af49c65 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/MokaStackFrame.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/MokaStackFrame.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActionActivationValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActionActivationValueAdapter.java
index dfef55c..5badcf3 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActionActivationValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActionActivationValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActivityEdgeInstanceValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActivityEdgeInstanceValueAdapter.java
index 77c18dd..96bc0fe 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActivityEdgeInstanceValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActivityEdgeInstanceValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActivityNodeActivationValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActivityNodeActivationValueAdapter.java
index 7a8238d..6f4c0d7 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActivityNodeActivationValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ActivityNodeActivationValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CS_EventOccurrenceValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CS_EventOccurrenceValueAdapter.java
index 8d4432b..66083f8 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CS_EventOccurrenceValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CS_EventOccurrenceValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CS_InteractionPointValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CS_InteractionPointValueAdapter.java
index 5fc0754..617268b 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CS_InteractionPointValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CS_InteractionPointValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CallEventOccurrenceValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CallEventOccurrenceValueAdapter.java
index fb24cb6..a447a7c 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CallEventOccurrenceValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CallEventOccurrenceValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CompletionEventOccurrenceValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CompletionEventOccurrenceValueAdapter.java
index ebfacd2..49cbc70 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CompletionEventOccurrenceValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/CompletionEventOccurrenceValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/DefaultValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/DefaultValueAdapter.java
index 39237a3..832a39a 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/DefaultValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/DefaultValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/EventOccurrenceValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/EventOccurrenceValueAdapter.java
index 7c5b349..60a414f 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/EventOccurrenceValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/EventOccurrenceValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapter.java
index 7c2194a..4fed572 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapterFactory.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapterFactory.java
index a854454..281c3c4 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapterFactory.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapterFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapterList.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapterList.java
index 120a87c..caea06c 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapterList.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/MokaValueAdapterList.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectNodeActivationValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectNodeActivationValueAdapter.java
index f24a7c3..5338a6e 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectNodeActivationValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectNodeActivationValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectTokenValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectTokenValueAdapter.java
index 8410c95..5cdfb11 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectTokenValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectTokenValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectValueAdapter.java
index 7e5e3be..d976e28 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ObjectValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/PrimitiveValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/PrimitiveValueAdapter.java
index 6a7747d..81a0f44 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/PrimitiveValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/PrimitiveValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ReferenceValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ReferenceValueAdapter.java
index 93f6f04..3e3066c 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ReferenceValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/ReferenceValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/SignalEventOccurrenceValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/SignalEventOccurrenceValueAdapter.java
index 2bd9f0b..d9c9cc6 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/SignalEventOccurrenceValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/SignalEventOccurrenceValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/StructuredValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/StructuredValueAdapter.java
index c859b69..bde82ba 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/StructuredValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/StructuredValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TimeEventOccurrenceValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TimeEventOccurrenceValueAdapter.java
index 22af093..3be6b72 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TimeEventOccurrenceValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TimeEventOccurrenceValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TokenValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TokenValueAdapter.java
index 00cdb32..d62674f 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TokenValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TokenValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TriggeredVisitorValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TriggeredVisitorValueAdapter.java
index 3348ff0..d0148a3 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TriggeredVisitorValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/TriggeredVisitorValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/VisitorValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/VisitorValueAdapter.java
index 1896016..7d902aa 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/VisitorValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/values/VisitorValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/CS_InteractionPointVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/CS_InteractionPointVariableAdapter.java
index 7f1dafc..501f5d5 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/CS_InteractionPointVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/CS_InteractionPointVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/EventOccurrenceVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/EventOccurrenceVariableAdapter.java
index 3d83d6b..51917f0 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/EventOccurrenceVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/EventOccurrenceVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/EventPoolVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/EventPoolVariableAdapter.java
index 14d80ac..2720625 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/EventPoolVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/EventPoolVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ExecutionContextVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ExecutionContextVariableAdapter.java
index f6db5fa..4141fdf 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ExecutionContextVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ExecutionContextVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/FeatureValueVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/FeatureValueVariableAdapter.java
index d134239..859e953 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/FeatureValueVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/FeatureValueVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ItemVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ItemVariableAdapter.java
index aa9a2df..7cab2a0 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ItemVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ItemVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/MokaVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/MokaVariableAdapter.java
index 7a9feb0..dc90b0c 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/MokaVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/MokaVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ObjectNodeActivationVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ObjectNodeActivationVariableAdapter.java
index e297137..3f7b37c 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ObjectNodeActivationVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ObjectNodeActivationVariableAdapter.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
+ */
 package org.eclipse.papyrus.moka.debug.model.data.mapping.variables;
 
 import org.eclipse.debug.core.DebugException;
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ObjectTokenVariableValueAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ObjectTokenVariableValueAdapter.java
index b73a5f1..b5f13c5 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ObjectTokenVariableValueAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ObjectTokenVariableValueAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ParameterValueVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ParameterValueVariableAdapter.java
index f590daf..404a23e 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ParameterValueVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/ParameterValueVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/PinActivationVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/PinActivationVariableAdapter.java
index 59bbb79..ba56273 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/PinActivationVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/PinActivationVariableAdapter.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
+ */
 package org.eclipse.papyrus.moka.debug.model.data.mapping.variables;
 
 import java.util.List;
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/SuspensionPointVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/SuspensionPointVariableAdapter.java
index 97e069f..ba58e66 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/SuspensionPointVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/SuspensionPointVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/TokensVariableAdapter.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/TokensVariableAdapter.java
index ce20478..a873f8f 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/TokensVariableAdapter.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/mapping/variables/TokensVariableAdapter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugLabelProvider.java
index 1367503..93e0aaa 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugLabelProviderFactory.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugLabelProviderFactory.java
index 7f1a3a2..ebd4c49 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugLabelProviderFactory.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugLabelProviderFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugModelPresentation.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugModelPresentation.java
index 0df02bf..dc9c669 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugModelPresentation.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/MokaDebugModelPresentation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CS_EventOccurrenceVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CS_EventOccurrenceVariableLabelProvider.java
index 072413f..8a030d2 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CS_EventOccurrenceVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CS_EventOccurrenceVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CS_InteractionPointVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CS_InteractionPointVariableLabelProvider.java
index 8295c49..69a1e1d 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CS_InteractionPointVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CS_InteractionPointVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CallEventOccurrenceVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CallEventOccurrenceVariableLabelProvider.java
index c5e80f2..b90b479 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CallEventOccurrenceVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CallEventOccurrenceVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CompletionEventOccurrenceVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CompletionEventOccurrenceVariableLabelProvider.java
index 8c67bac..be11751 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CompletionEventOccurrenceVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/CompletionEventOccurrenceVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/EventPoolVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/EventPoolVariableLabelProvider.java
index 820c4e2..0c0da3d 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/EventPoolVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/EventPoolVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ExecutionContextVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ExecutionContextVariableLabelProvider.java
index a8fb66b..07a428d 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ExecutionContextVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ExecutionContextVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/FeatureValueVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/FeatureValueVariableLabelProvider.java
index b6afecc..5354600 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/FeatureValueVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/FeatureValueVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ItemVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ItemVariableLabelProvider.java
index ee42bf7..e95d238 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ItemVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ItemVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ObjectNodeActivationVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ObjectNodeActivationVariableLabelProvider.java
index dfc4de1..844aaa8 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ObjectNodeActivationVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ObjectNodeActivationVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ParameterValueVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ParameterValueVariableLabelProvider.java
index d882b71..1e064f6 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ParameterValueVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/ParameterValueVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/SignalEventOccurrenceVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/SignalEventOccurrenceVariableLabelProvider.java
index f29ea94..01b6aff 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/SignalEventOccurrenceVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/SignalEventOccurrenceVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/SuspensionPointVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/SuspensionPointVariableLabelProvider.java
index b829e7a..62b3507 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/SuspensionPointVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/SuspensionPointVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/TimeEventOccurrenceVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/TimeEventOccurrenceVariableLabelProvider.java
index 06193fa..aafa439 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/TimeEventOccurrenceVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/TimeEventOccurrenceVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/TokensVariableLabelProvider.java b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/TokensVariableLabelProvider.java
index c6a50d8..5b159cd 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/TokensVariableLabelProvider.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/src/org/eclipse/papyrus/moka/debug/model/data/presentations/providers/TokensVariableLabelProvider.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/about.html b/bundles/core/services/org.eclipse.papyrus.moka.service/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/about.html
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/schema/service.exsd b/bundles/core/services/org.eclipse.papyrus.moka.service/schema/service.exsd
index 6ac1d76..6bb8849 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/schema/service.exsd
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/schema/service.exsd
@@ -106,4 +106,26 @@
    </annotation>
 
 
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+ /*****************************************************************************
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
 </schema>
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/AbstractMokaService.java b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/AbstractMokaService.java
index d7a85f4..70312bd 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/AbstractMokaService.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/AbstractMokaService.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/Activator.java b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/Activator.java
index 2f6f501..30def91 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/Activator.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaExecutionListener.java b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaExecutionListener.java
index 77846da..faf9bbc 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaExecutionListener.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaExecutionListener.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaService.java b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaService.java
index e7f7d71..18f8c54 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaService.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaService.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaStepListener.java b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaStepListener.java
index 976be77..997e7c1 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaStepListener.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/IMokaStepListener.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2017 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
+ */
 package org.eclipse.papyrus.moka.service;
 
 import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.IReference;
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/MokaServiceRegistry.java b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/MokaServiceRegistry.java
index 8e0950b..b6031e0 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/MokaServiceRegistry.java
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/src/org/eclipse/papyrus/moka/service/MokaServiceRegistry.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/about.html
index dd3c089..1595e5d 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/about.html
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/Activator.java b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/Activator.java
index 660f2e6..b5bef09 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/Activator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/AbstractCompositeUtilsHandler.java b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/AbstractCompositeUtilsHandler.java
index ec75707..38c4da3 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/AbstractCompositeUtilsHandler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/AbstractCompositeUtilsHandler.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateConstructorUsingFieldsHandler.java b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateConstructorUsingFieldsHandler.java
index af4883b..0b34c44 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateConstructorUsingFieldsHandler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateConstructorUsingFieldsHandler.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateFactoryHandler.java b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateFactoryHandler.java
index a9a16e21..d792dc5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateFactoryHandler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateFactoryHandler.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateMethodHandler.java b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateMethodHandler.java
index a092dd9..e3e7f32 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateMethodHandler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/GenerateMethodHandler.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java
index a453102..19bebd4 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/ui/GenerateConstructorUsingFieldsDialog.java b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/ui/GenerateConstructorUsingFieldsDialog.java
index 3ec982c..cf77770 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/ui/GenerateConstructorUsingFieldsDialog.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/ui/GenerateConstructorUsingFieldsDialog.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/about.html
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/AbstractPushPullStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/AbstractPushPullStrategy.java
index 1f7b49c..e896d6c 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/AbstractPushPullStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/AbstractPushPullStrategy.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/Activator.java b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/Activator.java
index 4c74322..1cf88c9 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/Activator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/DEScheduler.java b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/DEScheduler.java
index 4d67cd7..e38ea43 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/DEScheduler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/DEScheduler.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/DefaultPushPullStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/DefaultPushPullStrategy.java
index ba95a9e..1638447 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/DefaultPushPullStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/DefaultPushPullStrategy.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/Event.java b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/Event.java
index 9413a37..ffbec80 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/Event.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/Event.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/actions/Action.java b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/actions/Action.java
index 9ed243c..9953f5a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/actions/Action.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/src/org/eclipse/papyrus/moka/discreteevent/actions/Action.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/about.html
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/aspects/org/eclipse/papyrus/moka/externalcontrol/profiling/IExternallyControlledVisitorProfiler.aj b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/aspects/org/eclipse/papyrus/moka/externalcontrol/profiling/IExternallyControlledVisitorProfiler.aj
index a47f031..9664afd 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/aspects/org/eclipse/papyrus/moka/externalcontrol/profiling/IExternallyControlledVisitorProfiler.aj
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/aspects/org/eclipse/papyrus/moka/externalcontrol/profiling/IExternallyControlledVisitorProfiler.aj
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0.html/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/Activator.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/Activator.java
index 1459672..57480cc 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/Activator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/BasicControllerAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/BasicControllerAdvice.java
index 1f09796..1c1878d 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/BasicControllerAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/BasicControllerAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdvice.java
index 4659426..8d6f133 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdviceFactory.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdviceFactory.java
index 5e4b49a..80c913a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdviceFactory.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/advice/IControllerAdviceFactory.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/control/queue/ExternallyControlledExecutionLoop.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/control/queue/ExternallyControlledExecutionLoop.java
index 43f7fa6..df576c2 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/control/queue/ExternallyControlledExecutionLoop.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/control/queue/ExternallyControlledExecutionLoop.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/AbstractExternallyControlledVisitor.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/AbstractExternallyControlledVisitor.java
index 2a81e0e..ac647e9 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/AbstractExternallyControlledVisitor.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/AbstractExternallyControlledVisitor.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ControlledVisitorStep.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ControlledVisitorStep.java
index 762f7e2..23824c3 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ControlledVisitorStep.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ControlledVisitorStep.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ExternalController.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ExternalController.java
index 722be03..9f41250 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ExternalController.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/ExternalController.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IControlledVisitorPushPullStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IControlledVisitorPushPullStrategy.java
index b7bb5d0..06cea53 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IControlledVisitorPushPullStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IControlledVisitorPushPullStrategy.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IExternallyControlledVisitor.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IExternallyControlledVisitor.java
index 5e3ffb8..3a183d1 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IExternallyControlledVisitor.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/IExternallyControlledVisitor.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/LIFOPushPullStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/LIFOPushPullStrategy.java
index 2bf7995..58d7e30 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/LIFOPushPullStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/LIFOPushPullStrategy.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/NodeEdgeAlternatePushPullStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/NodeEdgeAlternatePushPullStrategy.java
index 0a0d711..b337a98 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/NodeEdgeAlternatePushPullStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/controller/NodeEdgeAlternatePushPullStrategy.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java
index b445266..829f173 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/engine/AbstractExternalControlExecutionEngine.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/AbstractExternallyControlledActionActivation.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/AbstractExternallyControlledActionActivation.java
index 6f29a7b..1bac287 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/AbstractExternallyControlledActionActivation.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/AbstractExternallyControlledActionActivation.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutionFactory.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutionFactory.java
index b363a97..941094e 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutionFactory.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutionFactory.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutor.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutor.java
index 3e577f3..91755b4 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutor.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternalControlExecutor.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActionActivation.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActionActivation.java
index 6a3ba64..9fd0b0c 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActionActivation.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActionActivation.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityEdgeInstance.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityEdgeInstance.java
index 611ad71..9b92513 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityEdgeInstance.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityEdgeInstance.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityExecution.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityExecution.java
index 95d075e..191a74a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityExecution.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledActivityExecution.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledCallActionActivation.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledCallActionActivation.java
index 1fa7c1b..61cf49b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledCallActionActivation.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/semantics/ExternallyControlledCallActionActivation.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/util/PushPullStrategyUtil.java b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/util/PushPullStrategyUtil.java
index aadd9ab..9f49e22 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/util/PushPullStrategyUtil.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/src/org/eclipse/papyrus/moka/externalcontrol/util/PushPullStrategyUtil.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
index 7d27956..106c609 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
@@ -4,4 +4,5 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/Activator.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/Activator.java
index 4eb29b6..5b74277 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/Activator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBImplementation.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBImplementation.java
index ba289a5..bf97c73 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBImplementation.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBImplementation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBInParam.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBInParam.java
index af484d1..617d61e 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBInParam.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBInParam.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBLibraryClass.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBLibraryClass.java
index cbccae5..f482b5b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBLibraryClass.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBLibraryClass.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBOutParam.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBOutParam.java
index 8a6c21c..1f27d1e 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBOutParam.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/FBOutParam.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/AnnotationUtil.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/AnnotationUtil.java
index 8ba4d8f..8f80eac 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/AnnotationUtil.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/AnnotationUtil.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/ExtensionHandler.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/ExtensionHandler.java
index 8d7bbdf..b3bf228 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/ExtensionHandler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/ExtensionHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryData.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryData.java
index 929fba8..e8a3b17 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryData.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryData.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionData.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionData.java
index 89557fe..3ad5214 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionData.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionData.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionHandler.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionHandler.java
index 9324cdf..cbf4cb3 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionHandler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryExtensionHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryProcessor.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryProcessor.java
index 376d707..234b7c5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryProcessor.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlLibraryProcessor.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlUMLGenerator.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlUMLGenerator.java
index 81c3082..539c057 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlUMLGenerator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/FumlUMLGenerator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/PluginUtil.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/PluginUtil.java
index 33c2da7..76b4a31 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/PluginUtil.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/PluginUtil.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionData.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionData.java
index 3bc8c70..354754d 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionData.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionData.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionHandler.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionHandler.java
index 88725b7..a9e1031 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionHandler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/UMLLibraryExtensionHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionData.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionData.java
index 920234f..e706e58 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionData.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionData.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionHandler.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionHandler.java
index dc84512..a6a33ff 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionHandler.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/processor/URIMappingExtensionHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/BehaviorRegistryGenerator.xtend b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/BehaviorRegistryGenerator.xtend
index c63285b..d5ad61d 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/BehaviorRegistryGenerator.xtend
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/BehaviorRegistryGenerator.xtend
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/OpaqueBehaviorExecutionGenerator.xtend b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/OpaqueBehaviorExecutionGenerator.xtend
index 0455005..c332490 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/OpaqueBehaviorExecutionGenerator.xtend
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/src/org/eclipse/papyrus/moka/fuml/libraries/tools/annotations/xtend/OpaqueBehaviorExecutionGenerator.xtend
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST) - david.lopez@cea.fr
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/about.html
index dd3c089..1595e5d 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/about.html
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/Activator.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/Activator.java
index fa0231b..61d9ffe 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/Activator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/ClientSelector.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/ClientSelector.java
index 112008a..9b8c89a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/ClientSelector.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/ClientSelector.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ActiveClassHasClassifierBehavior_Constraint.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ActiveClassHasClassifierBehavior_Constraint.java
index 5d79da2..5e5f99e 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ActiveClassHasClassifierBehavior_Constraint.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ActiveClassHasClassifierBehavior_Constraint.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java
index f6924bf..0182469 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/ArgumentAndResultPinsOfCallActions_Constraint.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NoDelegationConnectorOnNonBehaviorPort_Constraint.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NoDelegationConnectorOnNonBehaviorPort_Constraint.java
index 206a92e..c5f38f1 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NoDelegationConnectorOnNonBehaviorPort_Constraint.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NoDelegationConnectorOnNonBehaviorPort_Constraint.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NonAbstractOperationShallHaveMethod_Constraint.java b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NonAbstractOperationShallHaveMethod_Constraint.java
index a343748..1adca9e 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NonAbstractOperationShallHaveMethod_Constraint.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/src/org/eclipse/papyrus/moka/fuml/validation/constraints/NonAbstractOperationShallHaveMethod_Constraint.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/build.properties
index dac14ed..d8572b6 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/build.properties
@@ -2,4 +2,5 @@
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/src/org/eclipse/papyrus/moka/modeling/utils/InstanceSpecificationGeneratorUtil.java b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/src/org/eclipse/papyrus/moka/modeling/utils/InstanceSpecificationGeneratorUtil.java
index 308315e..ee80cc7 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/src/org/eclipse/papyrus/moka/modeling/utils/InstanceSpecificationGeneratorUtil.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/src/org/eclipse/papyrus/moka/modeling/utils/InstanceSpecificationGeneratorUtil.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.simex/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/about.html
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/Activator.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/Activator.java
index 75d94ae..df6f547 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/Activator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ActivityNodePinUpdateEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ActivityNodePinUpdateEditHelperAdvice.java
index 3c74b0c..46e999f 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ActivityNodePinUpdateEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ActivityNodePinUpdateEditHelperAdvice.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Sebastien REVOL
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/AddStructuralFeatureActionEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/AddStructuralFeatureActionEditHelperAdvice.java
index d150eea..054627b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/AddStructuralFeatureActionEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/AddStructuralFeatureActionEditHelperAdvice.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2013 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LinkActionEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LinkActionEditHelperAdvice.java
index c867a4a..24b2c98 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LinkActionEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LinkActionEditHelperAdvice.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LoopNodeEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LoopNodeEditHelperAdvice.java
index 16aa2ae..beb06d2 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LoopNodeEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/LoopNodeEditHelperAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadIsClassifiedObjectActionEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadIsClassifiedObjectActionEditHelperAdvice.java
index bc67c93..5fee34f 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadIsClassifiedObjectActionEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadIsClassifiedObjectActionEditHelperAdvice.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadSelfActionEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadSelfActionEditHelperAdvice.java
index 797e1d7..217d2bb 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadSelfActionEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ReadSelfActionEditHelperAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SendSignalActionEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SendSignalActionEditHelperAdvice.java
index 2366354..e936e05 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SendSignalActionEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SendSignalActionEditHelperAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SignalEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SignalEditHelperAdvice.java
index d7ee23a..3c6b4de 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SignalEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/SignalEditHelperAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/StartObjectBehaviorActionEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/StartObjectBehaviorActionEditHelperAdvice.java
index 827606f..4313525 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/StartObjectBehaviorActionEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/StartObjectBehaviorActionEditHelperAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/TestIdentityActionEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/TestIdentityActionEditHelperAdvice.java
index 3de02b5..36ceaa2 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/TestIdentityActionEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/TestIdentityActionEditHelperAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ValueSpecificationActionEditHelperAdvice.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ValueSpecificationActionEditHelperAdvice.java
index 76ab787..4309bca 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ValueSpecificationActionEditHelperAdvice.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/ValueSpecificationActionEditHelperAdvice.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/AbstractPinUpdateCommand.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/AbstractPinUpdateCommand.java
index 7adeb6a..efb87e5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/AbstractPinUpdateCommand.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/AbstractPinUpdateCommand.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/PinUpdateICommandFactory.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/PinUpdateICommandFactory.java
index 09ddc14..ec5a37e 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/PinUpdateICommandFactory.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/advices/commands/PinUpdateICommandFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptCallActionCommand.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptCallActionCommand.java
index 7355c95..2e7eb78 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptCallActionCommand.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptCallActionCommand.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptEventActionCommand.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptEventActionCommand.java
index b5e0946..2b7941e 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptEventActionCommand.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropAcceptEventActionCommand.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropGenericCommand.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropGenericCommand.java
index d5929ce..9d1c477 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropGenericCommand.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropGenericCommand.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropLinkActionCommand.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropLinkActionCommand.java
index a2d9a21..0cc9d10 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropLinkActionCommand.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/command/CreateAndDropLinkActionCommand.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AbstractDropInActivityStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AbstractDropInActivityStrategy.java
index 96130ef..4e19143 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AbstractDropInActivityStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AbstractDropInActivityStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ActivityToCallBehaviorActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ActivityToCallBehaviorActionStrategy.java
index a6ff85c..99ff358 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ActivityToCallBehaviorActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ActivityToCallBehaviorActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToClearAssociationActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToClearAssociationActionStrategy.java
index ee19a5a..e502450 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToClearAssociationActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToClearAssociationActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToCreateLinkAction.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToCreateLinkAction.java
index 9bdfe4e..3883e0f 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToCreateLinkAction.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToCreateLinkAction.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToDestroyLinkAction.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToDestroyLinkAction.java
index b43f9c7..5749f89 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToDestroyLinkAction.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToDestroyLinkAction.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToReadLinkAction.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToReadLinkAction.java
index bfce57b..4eec7f5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToReadLinkAction.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/AssociationToReadLinkAction.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToCallBehaviorActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToCallBehaviorActionStrategy.java
index 9b68f87..2c2e4cf 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToCallBehaviorActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToCallBehaviorActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToReduceActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToReduceActionStrategy.java
index 910a6cd..01607d3 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToReduceActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/BehaviorToReduceActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToCreateObjectActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToCreateObjectActionStrategy.java
index af6593c..581ffdf 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToCreateObjectActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToCreateObjectActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadExtentActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadExtentActionStrategy.java
index 1057c78..1b78aab 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadExtentActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadExtentActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadIsClassifiedObjectActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadIsClassifiedObjectActionStrategy.java
index 22ff394..539d249 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadIsClassifiedObjectActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToReadIsClassifiedObjectActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToUnmarshallActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToUnmarshallActionStrategy.java
index ab65047..2d6ac4d 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToUnmarshallActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ClassifierToUnmarshallActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/DndMessages.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/DndMessages.java
index 7d171af..cc1d557 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/DndMessages.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/DndMessages.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Sebastien Revol - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToAcceptCallActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToAcceptCallActionStrategy.java
index a8c3d1a..7d743f4 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToAcceptCallActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToAcceptCallActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToCallOperationActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToCallOperationActionStrategy.java
index 0591531..07364ef 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToCallOperationActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/OperationToCallOperationActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ParameterToActivityParameterNodeStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ParameterToActivityParameterNodeStrategy.java
index f25c3ad..36ee067 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ParameterToActivityParameterNodeStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/ParameterToActivityParameterNodeStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToAddStructuralFeatureValueActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToAddStructuralFeatureValueActionStrategy.java
index b98f791..9442986 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToAddStructuralFeatureValueActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToAddStructuralFeatureValueActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToClearStructuralFeatureActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToClearStructuralFeatureActionStrategy.java
index a9a4e5f..d7b7815 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToClearStructuralFeatureActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToClearStructuralFeatureActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToReadStructuralFeatureActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToReadStructuralFeatureActionStrategy.java
index 4dfa8ef..bebdd47 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToReadStructuralFeatureActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/PropertyToReadStructuralFeatureActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToAcceptEventActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToAcceptEventActionStrategy.java
index a500342..2eb859a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToAcceptEventActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToAcceptEventActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToBroadcastActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToBroadcastActionStrategy.java
index 743ea02..54b8a34 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToBroadcastActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToBroadcastActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToSendSignalActionStrategy.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToSendSignalActionStrategy.java
index 76cc2e5..a14e6eb 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToSendSignalActionStrategy.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/dnd/strategy/SignalToSendSignalActionStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/EventUtil.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/EventUtil.java
index 9dace32..dcebddc 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/EventUtil.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/EventUtil.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/FoundationalModelLibraryUtils.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/FoundationalModelLibraryUtils.java
index 8d94e55..842828d 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/FoundationalModelLibraryUtils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/FoundationalModelLibraryUtils.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/PinUtils.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/PinUtils.java
index 335a05d..9914c67 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/PinUtils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/PinUtils.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Sebastie  Revol CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RegisteredLibraryLoadAndSearchUtils.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RegisteredLibraryLoadAndSearchUtils.java
index f28c7ec..6673e58 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RegisteredLibraryLoadAndSearchUtils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RegisteredLibraryLoadAndSearchUtils.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RequestUtils.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RequestUtils.java
index 6c4550e..3f149ec 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RequestUtils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/RequestUtils.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/UMLPrimitiveTypesUtils.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/UMLPrimitiveTypesUtils.java
index bb539e2..49ccf02 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/UMLPrimitiveTypesUtils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/utils/UMLPrimitiveTypesUtils.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
index b92d0ee..54ec476 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/src/org/eclipse/papyrus/moka/simex/viewpoint/SimexViewpointListener.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/about.html
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Activator.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Activator.java
index 9d3e9a4..8a81996 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Activator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/CustomSpecificationSetCommand.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/CustomSpecificationSetCommand.java
index 52cd0ec..5d9897c 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/CustomSpecificationSetCommand.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/CustomSpecificationSetCommand.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecCellAxisConfiguration.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecCellAxisConfiguration.java
index 1755727..b0310d5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecCellAxisConfiguration.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecCellAxisConfiguration.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationRowAxisManager.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationRowAxisManager.java
index a628f42..5a885dc 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationRowAxisManager.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationRowAxisManager.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableCellManager.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableCellManager.java
index ea3e851..867e4e6 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableCellManager.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableCellManager.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableHeaderLabelProvider.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableHeaderLabelProvider.java
index d9fe763..59caa04 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableHeaderLabelProvider.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableHeaderLabelProvider.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableTester.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableTester.java
index 4ef8817..218e8ac 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableTester.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/InstanceSpecificationTableTester.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Messages.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Messages.java
index 9bd7a0e..8f1b0c3 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Messages.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/Messages.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/util/InstanceSpecificationTableUtil.java b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/util/InstanceSpecificationTableUtil.java
index 4b6e6b7..a1345d5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/util/InstanceSpecificationTableUtil.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/src/org/eclipse/papyrus/moka/ui/table/instancespecification/util/InstanceSpecificationTableUtil.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2017 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/build.properties
index dac14ed..d8572b6 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/build.properties
@@ -2,4 +2,5 @@
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/EditorUtils.java b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/EditorUtils.java
index b8cac5b..5d616a2 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/EditorUtils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/EditorUtils.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/OpenPapyrusEditorRunnable.java b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/OpenPapyrusEditorRunnable.java
index 82a8da0..4d765fb 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/OpenPapyrusEditorRunnable.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/OpenPapyrusEditorRunnable.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/presentation/LabelProviderHelper.java b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/presentation/LabelProviderHelper.java
index 2c5fe1a..04c132c 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/presentation/LabelProviderHelper.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/src/org/eclipse/papyrus/moka/utils/helper/presentation/LabelProviderHelper.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/about.html b/bundles/core/tools/org.eclipse.papyrus.moka.utils/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/about.html
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/Activator.java b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/Activator.java
index 7b1eb49..ae49f5b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/Activator.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/ResourceSetUtils.java b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/ResourceSetUtils.java
index f9896d3..b042387 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/ResourceSetUtils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/ResourceSetUtils.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/UMLPrimitiveTypesUtils.java b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/UMLPrimitiveTypesUtils.java
index 5b1bb36..812497b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/UMLPrimitiveTypesUtils.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/UMLPrimitiveTypesUtils.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/constants/MokaConstants.java b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/constants/MokaConstants.java
index ec79fb8..f79fa37 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/constants/MokaConstants.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/constants/MokaConstants.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/helper/semantics/SemanticHelper.java b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/helper/semantics/SemanticHelper.java
index 5f39591..2e54000 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/helper/semantics/SemanticHelper.java
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/src/org/eclipse/papyrus/moka/utils/helper/semantics/SemanticHelper.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/about.html b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/about.html
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceCommand.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceCommand.java
index 08176ed..d7ec30a 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceCommand.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceCommand.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceHandler.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceHandler.java
index 10112e4..7161455 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceHandler.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/CreateXYGraphFromDataSourceHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ExportCSVHandler.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ExportCSVHandler.java
index 6f24a0b..e493157 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ExportCSVHandler.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ExportCSVHandler.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ImportCSVHandler.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ImportCSVHandler.java
index 1275c2a..f2e3890 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ImportCSVHandler.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/handlers/ImportCSVHandler.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataPort.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataPort.java
index dbdc544..22112cc 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataPort.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataPort.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSeriesXYGraphCoordinator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSeriesXYGraphCoordinator.java
index cbb9828..f175c6c 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSeriesXYGraphCoordinator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSeriesXYGraphCoordinator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSourceVariableID.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSourceVariableID.java
index 3881407..38e37da 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSourceVariableID.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataSourceVariableID.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataVisualizationService.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataVisualizationService.java
index 32741e1..3cd71fe 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataVisualizationService.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/DataVisualizationService.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataEntry.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataEntry.java
index ddfcbfc..34f4592 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataEntry.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataEntry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataInformation.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataInformation.java
index 7ae3523..3a1cf50 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataInformation.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableDataInformation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntry.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntry.java
index 9cd4b58..ff5be66 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntry.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntry.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryFactory.java
index 2d1e417..0d5e0da 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryTable.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryTable.java
index 4f9bf43..18b4c79 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryTable.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableEntryTable.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableImpl.java
index 62279c8..35a7172 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/service/VariableImpl.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphPropertiesNotificationService.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphPropertiesNotificationService.java
index bb80c93..05c7a64 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphPropertiesNotificationService.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphPropertiesNotificationService.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphResourceSetListener.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphResourceSetListener.java
index 868d3d5..06de753 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphResourceSetListener.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/services/XYGraphResourceSetListener.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/Activator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/Activator.java
index 24c8eda..612c452 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/Activator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/GraphBuilderHelper.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/GraphBuilderHelper.java
index d527744..9a8c489 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/GraphBuilderHelper.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/GraphBuilderHelper.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/XYGraphFilteredLabelProvider.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/XYGraphFilteredLabelProvider.java
index d93504a..de4bda2 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/XYGraphFilteredLabelProvider.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/XYGraphFilteredLabelProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/diagram/DataSeriesXYGraphPageFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/diagram/DataSeriesXYGraphPageFactory.java
index 383db59..cf9b871 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/diagram/DataSeriesXYGraphPageFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/diagram/DataSeriesXYGraphPageFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/dialogs/ExportImportCSVDialog.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/dialogs/ExportImportCSVDialog.java
index 1589570..9373b90 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/dialogs/ExportImportCSVDialog.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/dialogs/ExportImportCSVDialog.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/tester/DataSourcePropertyTester.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/tester/DataSourcePropertyTester.java
index b228558..d7a8cf6 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/tester/DataSourcePropertyTester.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/src/org/eclipse/papyrus/moka/datavisualization/ui/tester/DataSourcePropertyTester.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
index 536c3ae..11a8113 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
@@ -5,9 +5,11 @@
 Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.moka.datavisualization.Activator
-Bundle-Vendor: Eclipse ModelingFramework
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.emf.ecore,
+ org.eclipse.uml2.types,
  org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/about.html b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/about.html
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.genmodel b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.genmodel
index be3b999..a8ed193 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.genmodel
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/profile/datavisualization.profile.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
-    copyrightText="Copyright (c) 2016 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA; Contributors:&#xD;&#xA;  CEA LIST - Initial API and implementation"
+    copyrightText="Copyright (c) 2016 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License 2.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; https://www.eclipse.org/legal/epl-2.0 &#xD;&#xA;&#xD;&#xA;SPDX-License-Identifier: EPL-2.0&#xD;&#xA;&#xD;&#xA; Contributors:&#xD;&#xA;  CEA LIST - Initial API and implementation"
     modelDirectory="/org.eclipse.papyrus.moka.datavisualization/src-gen" modelPluginID="org.eclipse.papyrus.moka.datavisualization"
     modelName="Datavisualization" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/BooleanSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/BooleanSeries.java
index 8497f96..fb6a741 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/BooleanSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/BooleanSeries.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -35,7 +37,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Values</b></em>' attribute list.
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DataSource.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DataSource.java
index 94b92c2..6f3f4f5 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DataSource.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DataSource.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -40,7 +42,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Base Data Type</b></em>' reference.
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DoubleSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DoubleSeries.java
index 5b30e86..98329ed 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DoubleSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/DoubleSeries.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -35,7 +37,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Values</b></em>' attribute list.
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/IntegerSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/IntegerSeries.java
index 5648b99..b5101eb 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/IntegerSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/IntegerSeries.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -35,7 +37,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Values</b></em>' attribute list.
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/StringSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/StringSeries.java
index 6049d94..ee3afa7 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/StringSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/StringSeries.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -35,7 +37,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Values</b></em>' attribute list.
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/ValueSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/ValueSeries.java
index 3f4b8b1..955752d 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/ValueSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/ValueSeries.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -12,6 +14,7 @@
 package org.eclipse.papyrus.moka.datavisualization.profile;
 
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.uml2.uml.Property;
 
 /**
@@ -38,7 +41,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Binary String</b></em>' attribute.
@@ -121,17 +124,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model required="true" ordered="false" indexRequired="true" indexOrdered="false"
-	 * @generated
-	 */
-	String getStringValue(int index);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * @model kind="operation" required="true" ordered="false"
 	 * @generated
 	 */
 	int getSize();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model required="true" ordered="false" indexRequired="true" indexOrdered="false"
+	 * @generated
+	 */
+	String getStringValue(int index);
+
 } // ValueSeries
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationFactory.java
index 7d3e4f4..e8f58bf 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -27,7 +29,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The singleton instance of the factory.
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationPackage.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationPackage.java
index 322c156..ea4e379 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationPackage.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/VisualizationPackage.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -40,7 +42,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The package name.
@@ -598,16 +600,6 @@
 	EReference getValueSeries_Dependent();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.moka.datavisualization.profile.ValueSeries#getStringValue(int) <em>Get String Value</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the '<em>Get String Value</em>' operation.
-	 * @see org.eclipse.papyrus.moka.datavisualization.profile.ValueSeries#getStringValue(int)
-	 * @generated
-	 */
-	EOperation getValueSeries__GetStringValue__int();
-
-	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.moka.datavisualization.profile.ValueSeries#getSize() <em>Get Size</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -618,6 +610,16 @@
 	EOperation getValueSeries__GetSize();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.moka.datavisualization.profile.ValueSeries#getStringValue(int) <em>Get String Value</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Get String Value</em>' operation.
+	 * @see org.eclipse.papyrus.moka.datavisualization.profile.ValueSeries#getStringValue(int)
+	 * @generated
+	 */
+	EOperation getValueSeries__GetStringValue__int();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.moka.datavisualization.profile.StringSeries <em>String Series</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -785,14 +787,6 @@
 		EReference VALUE_SERIES__DEPENDENT = eINSTANCE.getValueSeries_Dependent();
 
 		/**
-		 * The meta object literal for the '<em><b>Get String Value</b></em>' operation.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EOperation VALUE_SERIES___GET_STRING_VALUE__INT = eINSTANCE.getValueSeries__GetStringValue__int();
-
-		/**
 		 * The meta object literal for the '<em><b>Get Size</b></em>' operation.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -801,6 +795,14 @@
 		EOperation VALUE_SERIES___GET_SIZE = eINSTANCE.getValueSeries__GetSize();
 
 		/**
+		 * The meta object literal for the '<em><b>Get String Value</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation VALUE_SERIES___GET_STRING_VALUE__INT = eINSTANCE.getValueSeries__GetStringValue__int();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.moka.datavisualization.profile.impl.StringSeriesImpl <em>String Series</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/BooleanSeriesImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/BooleanSeriesImpl.java
index 2ff483f..5db4efb 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/BooleanSeriesImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/BooleanSeriesImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -41,7 +43,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.
@@ -153,7 +155,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (values: ");
 		result.append(values);
 		result.append(')');
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DataSourceImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DataSourceImpl.java
index b186910..ba8afe5 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DataSourceImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DataSourceImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -12,6 +14,7 @@
 package org.eclipse.papyrus.moka.datavisualization.profile.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
@@ -19,6 +22,7 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.moka.datavisualization.profile.DataSource;
 import org.eclipse.papyrus.moka.datavisualization.profile.ValueSeries;
 import org.eclipse.papyrus.moka.datavisualization.profile.VisualizationPackage;
@@ -45,7 +49,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getBase_DataType() <em>Base Data Type</em>}' reference.
@@ -147,7 +151,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DoubleSeriesImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DoubleSeriesImpl.java
index dbf468a..6b36038 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DoubleSeriesImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/DoubleSeriesImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -41,7 +43,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.
@@ -153,7 +155,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (values: ");
 		result.append(values);
 		result.append(')');
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/IntegerSeriesImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/IntegerSeriesImpl.java
index e987db7..360be51 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/IntegerSeriesImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/IntegerSeriesImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -41,7 +43,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.
@@ -153,7 +155,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (values: ");
 		result.append(values);
 		result.append(')');
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/StringSeriesImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/StringSeriesImpl.java
index d4fa5ea..96bf03c 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/StringSeriesImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/StringSeriesImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -41,7 +43,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.
@@ -153,7 +155,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (values: ");
 		result.append(values);
 		result.append(')');
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/ValueSeriesImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/ValueSeriesImpl.java
index de73ac9..6c8363e 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/ValueSeriesImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/ValueSeriesImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -18,13 +20,14 @@
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.papyrus.moka.datavisualization.profile.ValueSeries;
 import org.eclipse.papyrus.moka.datavisualization.profile.VisualizationPackage;
+
 import org.eclipse.uml2.uml.Property;
 
 /**
@@ -48,7 +51,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The default value of the '{@link #getBinaryString() <em>Binary String</em>}' attribute.
@@ -211,7 +214,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getStringValue(int index) {
+	public int getSize() {
 		// TODO: implement this method
 		// Ensure that you remove @generated or mark it @generated NOT
 		throw new UnsupportedOperationException();
@@ -222,7 +225,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public int getSize() {
+	public String getStringValue(int index) {
 		// TODO: implement this method
 		// Ensure that you remove @generated or mark it @generated NOT
 		throw new UnsupportedOperationException();
@@ -333,7 +336,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (binaryString: ");
 		result.append(binaryString);
 		result.append(')');
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationFactoryImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationFactoryImpl.java
index 54fc182..7b23765 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationFactoryImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationFactoryImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -33,7 +35,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Creates the default factory implementation.
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationPackageImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationPackageImpl.java
index 021cb8b..a52ebe7 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationPackageImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/impl/VisualizationPackageImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -16,6 +18,7 @@
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
@@ -44,7 +47,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -116,7 +119,7 @@
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link VisualizationPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -130,11 +133,14 @@
 		if (isInited) return (VisualizationPackage)EPackage.Registry.INSTANCE.getEPackage(VisualizationPackage.eNS_URI);
 
 		// Obtain or create and register package
-		VisualizationPackageImpl theVisualizationPackage = (VisualizationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VisualizationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VisualizationPackageImpl());
+		Object registeredVisualizationPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		VisualizationPackageImpl theVisualizationPackage = registeredVisualizationPackage instanceof VisualizationPackageImpl ? (VisualizationPackageImpl)registeredVisualizationPackage : new VisualizationPackageImpl();
 
 		isInited = true;
 
 		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		TypesPackage.eINSTANCE.eClass();
 		UMLPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
@@ -146,7 +152,6 @@
 		// Mark meta-data to indicate it can't be changed
 		theVisualizationPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(VisualizationPackage.eNS_URI, theVisualizationPackage);
 		return theVisualizationPackage;
@@ -220,8 +225,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getValueSeries__GetStringValue__int() {
-		return valueSeriesEClass.getEOperations().get(1);
+	public EOperation getValueSeries__GetSize() {
+		return valueSeriesEClass.getEOperations().get(0);
 	}
 
 	/**
@@ -229,8 +234,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getValueSeries__GetSize() {
-		return valueSeriesEClass.getEOperations().get(0);
+	public EOperation getValueSeries__GetStringValue__int() {
+		return valueSeriesEClass.getEOperations().get(1);
 	}
 
 	/**
@@ -436,12 +441,12 @@
 	 * @generated
 	 */
 	protected void createUMLAnnotations() {
-		String source = "http://www.eclipse.org/uml2/2.0.0/UML";	
+		String source = "http://www.eclipse.org/uml2/2.0.0/UML";
 		addAnnotation
-		  (this, 
-		   source, 
+		  (this,
+		   source,
 		   new String[] {
-			 "originalName", "DataVisualizationProfile"
+			   "originalName", "DataVisualizationProfile"
 		   });
 	}
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationAdapterFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationAdapterFactory.java
index 70274be..0e2ca56 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationAdapterFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationAdapterFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -34,7 +36,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached model package.
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationSwitch.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationSwitch.java
index f2d12e8..0f91428 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationSwitch.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src-gen/org/eclipse/papyrus/moka/datavisualization/profile/util/VisualizationSwitch.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -37,7 +39,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License v1.0\r\n which accompanies this distribution, and is available at\r\n http://www.eclipse.org/legal/epl-v10.html\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2016 CEA LIST.\r\n\r\n All rights reserved. This program and the accompanying materials\r\n are made available under the terms of the Eclipse Public License 2.0\r\n which accompanies this distribution, and is available at\r\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\r\n\r\n Contributors:\r\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached model package
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/Activator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/Activator.java
index 7dd079a..ef80d1e 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/Activator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResource.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResource.java
index e8b237e..fcbc31e 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResource.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResource.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResourceFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResourceFactory.java
index 263eacd..2c205d5 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResourceFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/csv/CSVResourceFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomBooleanSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomBooleanSeries.java
index c30ffff..9636537 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomBooleanSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomBooleanSeries.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDataSources.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDataSources.java
index 1998744..704de09 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDataSources.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDataSources.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDoubleSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDoubleSeries.java
index 8d7a2d2..0e15269 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDoubleSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomDoubleSeries.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomIntegerSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomIntegerSeries.java
index 683239c..426c10e 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomIntegerSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomIntegerSeries.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomStringSeries.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomStringSeries.java
index a87cc19..303965e 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomStringSeries.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomStringSeries.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomVisualizationPackageFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomVisualizationPackageFactory.java
index 3749b53..bda3950 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomVisualizationPackageFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/profile/custom/CustomVisualizationPackageFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/util/VisualizationUtil.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/util/VisualizationUtil.java
index b0342a4..779c25f 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/util/VisualizationUtil.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/src/org/eclipse/papyrus/moka/datavisualization/util/VisualizationUtil.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/about.html b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/about.html
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/Activator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/Activator.java
index 2d815d2..7ed5a48 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/Activator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/adapter/XYGraphAdapterFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/adapter/XYGraphAdapterFactory.java
index 5fb6013..4b5482e 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/adapter/XYGraphAdapterFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/adapter/XYGraphAdapterFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/model/XYGraphDescriptorModel.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/model/XYGraphDescriptorModel.java
index 7ca8277..a243cfc 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/model/XYGraphDescriptorModel.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/model/XYGraphDescriptorModel.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/AbstractXYGraphPageFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/AbstractXYGraphPageFactory.java
index 8a017d7..349db5f 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/AbstractXYGraphPageFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/AbstractXYGraphPageFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPart.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPart.java
index 6ab79e0..234867f 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPart.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPart.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPartSelectionProvider.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPartSelectionProvider.java
index acbff33..736c37b 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPartSelectionProvider.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphEditorPartSelectionProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphLabelProvider.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphLabelProvider.java
index bc405a9..60e9978 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphLabelProvider.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/ui/XYGraphLabelProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceAxisUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceAxisUpdateStrategy.java
index e91c4bc..31532fd 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceAxisUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceAxisUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceBaseUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceBaseUpdateStrategy.java
index 9a44937..74ec2a1 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceBaseUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceBaseUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceTraceUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceTraceUpdateStrategy.java
index e42469f..6de8831 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceTraceUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceTraceUpdateStrategy.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceWriteStrategyFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceWriteStrategyFactory.java
index fd78ce4..fbc9d90 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceWriteStrategyFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceWriteStrategyFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceXYGraphUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceXYGraphUpdateStrategy.java
index 4e3b591..796255a 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceXYGraphUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/src/org/eclipse/papyrus/moka/xygraph/common/writing/ResourceXYGraphUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/about.html b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/about.html
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/Activator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/Activator.java
index f11621a..b3e65c4 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/Activator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/DefaultXYGraphBinder.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/DefaultXYGraphBinder.java
index 50e7bb3..a299712 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/DefaultXYGraphBinder.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/DefaultXYGraphBinder.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/Variable.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/Variable.java
index 5f06662..f6fe010 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/Variable.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/Variable.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphBinder.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphBinder.java
index e5ffe09..5a06311 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphBinder.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphBinder.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphCoordinator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphCoordinator.java
index 13c6e62..6aaaa1d 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphCoordinator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphCoordinator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphDataBinder.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphDataBinder.java
index b5b9625..b93832b 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphDataBinder.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphDataBinder.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphListener.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphListener.java
index 9704127..9b45a54 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphListener.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphListener.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphMappingHelper.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphMappingHelper.java
index 729a18d..3f2b07a 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphMappingHelper.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphMappingHelper.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphWidgetBinder.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphWidgetBinder.java
index ed397c7..f9642ad 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphWidgetBinder.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/common/XYGraphWidgetBinder.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/BaseAxisListener.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/BaseAxisListener.java
index 87781cb..3b39b24 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/BaseAxisListener.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/BaseAxisListener.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/DataBatch.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/DataBatch.java
index 980e1b2..df0f6fc 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/DataBatch.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/DataBatch.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LUT.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LUT.java
index bd9af74..d932c62 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LUT.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LUT.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
index 733b708..d235ac4 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataSample.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataSample.java
index 88846f5..ac949fe 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataSample.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataSample.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/TraceDataBounds.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/TraceDataBounds.java
index f5130fe..b5a15d9 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/TraceDataBounds.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/TraceDataBounds.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisBuildStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisBuildStrategy.java
index f6e8255..254e686 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisBuildStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisBuildStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisUpdateStrategy.java
index a298a77..f6f9b87 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/AxisUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/ModelWritingStrategyFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/ModelWritingStrategyFactory.java
index ab5bad4..93a45ff 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/ModelWritingStrategyFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/ModelWritingStrategyFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceBuildStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceBuildStrategy.java
index fadb482..a4f5296 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceBuildStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceBuildStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceUpdateStrategy.java
index d49a788..c50a748 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/TraceUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphBuildStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphBuildStrategy.java
index 2e684c1..f4f7f9f 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphBuildStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphBuildStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphUpdateStrategy.java
index e6d61d8..a18a077 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/XYGraphUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisBuildStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisBuildStrategy.java
index a04afaa..8994eb2 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisBuildStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisBuildStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisUpdateStrategy.java
index 11f1486..b16b003 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultAxisUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultModelWritingStrategyFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultModelWritingStrategyFactory.java
index 5ab10ee..c768400 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultModelWritingStrategyFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultModelWritingStrategyFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceBuildStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceBuildStrategy.java
index 658da09..a3b05d0 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceBuildStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceBuildStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceUpdateStrategy.java
index c7f97a7..680a6f7 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultTraceUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphBuildStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphBuildStrategy.java
index a99a5eb..c8e5cdb 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphBuildStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphBuildStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphUpdateStrategy.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphUpdateStrategy.java
index 737edc5..67ea5fb 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphUpdateStrategy.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/DefaultXYGraphUpdateStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/MouseWheelZoomer.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/MouseWheelZoomer.java
index ee67cbc..29a5dd9 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/MouseWheelZoomer.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/writing/impl/MouseWheelZoomer.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
index 63d08ef..2c680a4 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.eclipse.papyrus.moka.xygraph.model;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: .
-Bundle-Vendor: Eclipse Modeling Project
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.papyrus.moka.xygraph.model.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/about.html b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/about.html
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.genmodel b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.genmodel
index cffb941..ec51502 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.genmodel
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/model/XYGraph.genmodel
@@ -1,6 +1,7 @@
 <?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" modelDirectory="/org.eclipse.papyrus.moka.xygraph.model/src-gen"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" 
+	copyrightText="Copyright (c) 2016 CEA LIST.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0 &#xD;&#xA;&#xD;&#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA;  CEA LIST - Initial API and implementation"    modelDirectory="/org.eclipse.papyrus.moka.xygraph.model/src-gen"
     modelPluginID="org.eclipse.papyrus.moka.xygraph.model" modelName="XYGraph" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
     operationReflection="true" importOrganizing="true">
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/AxisDescriptor.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/AxisDescriptor.java
index 8f8848d..e8b25bf 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/AxisDescriptor.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/AxisDescriptor.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ColorDescriptor.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ColorDescriptor.java
index 8dee112..bd4555d 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ColorDescriptor.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ColorDescriptor.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/FontDescriptor.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/FontDescriptor.java
index d0ddb95..ad98ed9 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/FontDescriptor.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/FontDescriptor.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/LinearScale_Orientation.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/LinearScale_Orientation.java
index 39a228f..b2194f1 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/LinearScale_Orientation.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/LinearScale_Orientation.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/TraceDescriptor.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/TraceDescriptor.java
index 8d97e2f..bb7fbf3 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/TraceDescriptor.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/TraceDescriptor.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_BaseLine.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_BaseLine.java
index 2143e0b..5f3218c 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_BaseLine.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_BaseLine.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_ErrorBarType.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_ErrorBarType.java
index 7098680..792516f 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_ErrorBarType.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_ErrorBarType.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_PointStyle.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_PointStyle.java
index 34c96e6..407528a 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_PointStyle.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_PointStyle.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_TraceType.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_TraceType.java
index e209f88..cf103ed 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_TraceType.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/Trace_TraceType.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphDescriptor.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphDescriptor.java
index 87bb1aa..06a6a72 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphDescriptor.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphDescriptor.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphFactory.java
index efed50a..3a733c4 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphFactory.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphPackage.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphPackage.java
index 297480b..6e8b3ff 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphPackage.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/XYGraphPackage.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ZoomType.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ZoomType.java
index 2c8bb88..0c648aa 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ZoomType.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/ZoomType.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph;
 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/AxisDescriptorImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/AxisDescriptorImpl.java
index a3721e2..9927d61 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/AxisDescriptorImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/AxisDescriptorImpl.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.impl;
 
@@ -10,6 +21,7 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.AxisDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.ColorDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.FontDescriptor;
@@ -1346,7 +1358,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (orientation: ");
 		result.append(orientation);
 		result.append(", autoScale: ");
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/ColorDescriptorImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/ColorDescriptorImpl.java
index 9ad58c2..ec31700 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/ColorDescriptorImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/ColorDescriptorImpl.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.impl;
 
@@ -8,6 +19,7 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.ColorDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.XYGraphPackage;
 
@@ -256,7 +268,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (r: ");
 		result.append(r);
 		result.append(", g: ");
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/FontDescriptorImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/FontDescriptorImpl.java
index 196417d..ebf9450 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/FontDescriptorImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/FontDescriptorImpl.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.impl;
 
@@ -8,6 +19,7 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.FontDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.XYGraphPackage;
 
@@ -256,7 +268,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(", size: ");
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/TraceDescriptorImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/TraceDescriptorImpl.java
index fbbcf2f..d39128b 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/TraceDescriptorImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/TraceDescriptorImpl.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.impl;
 
@@ -11,6 +22,7 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.AxisDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.ColorDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.TraceDescriptor;
@@ -1109,7 +1121,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (antiAliasing: ");
 		result.append(antiAliasing);
 		result.append(", areaAlpha: ");
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphDescriptorImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphDescriptorImpl.java
index 138e8ab..fc66b3e 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphDescriptorImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphDescriptorImpl.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.impl;
 
@@ -19,6 +30,7 @@
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.AxisDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.ColorDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.FontDescriptor;
@@ -865,7 +877,7 @@
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (title: ");
 		result.append(title);
 		result.append(", showLegend: ");
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphFactoryImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphFactoryImpl.java
index 882e63c..c6b9669 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphFactoryImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphFactoryImpl.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.impl;
 
@@ -10,6 +21,7 @@
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.*;
 
 /**
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphPackageImpl.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphPackageImpl.java
index a6b2ab9..3673003 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphPackageImpl.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/impl/XYGraphPackageImpl.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.impl;
 
@@ -9,6 +20,7 @@
 import org.eclipse.emf.ecore.EReference;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.AxisDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.ColorDescriptor;
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.FontDescriptor;
@@ -135,7 +147,7 @@
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link XYGraphPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -149,7 +161,8 @@
 		if (isInited) return (XYGraphPackage)EPackage.Registry.INSTANCE.getEPackage(XYGraphPackage.eNS_URI);
 
 		// Obtain or create and register package
-		XYGraphPackageImpl theXYGraphPackage = (XYGraphPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XYGraphPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XYGraphPackageImpl());
+		Object registeredXYGraphPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		XYGraphPackageImpl theXYGraphPackage = registeredXYGraphPackage instanceof XYGraphPackageImpl ? (XYGraphPackageImpl)registeredXYGraphPackage : new XYGraphPackageImpl();
 
 		isInited = true;
 
@@ -162,7 +175,6 @@
 		// Mark meta-data to indicate it can't be changed
 		theXYGraphPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(XYGraphPackage.eNS_URI, theXYGraphPackage);
 		return theXYGraphPackage;
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphAdapterFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphAdapterFactory.java
index ddb96c5..81a3b9e 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphAdapterFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphAdapterFactory.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.util;
 
@@ -8,6 +19,7 @@
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.*;
 
 /**
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphSwitch.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphSwitch.java
index a0749c3..d77ce0f 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphSwitch.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src-gen/org/eclipse/papyrus/moka/xygraph/model/xygraph/util/XYGraphSwitch.java
@@ -1,4 +1,15 @@
 /**
+ * Copyright (c) 2016 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
  */
 package org.eclipse.papyrus.moka.xygraph.model.xygraph.util;
 
@@ -6,6 +17,7 @@
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
+
 import org.eclipse.papyrus.moka.xygraph.model.xygraph.*;
 
 /**
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/Activator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/Activator.java
index f485220..ec716ab 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/Activator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/AxisStructuralFeature.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/AxisStructuralFeature.java
index fdf3d30..3667638 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/AxisStructuralFeature.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/AxisStructuralFeature.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/TraceStructuralFeature.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/TraceStructuralFeature.java
index 978ca2e..03f6b9a 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/TraceStructuralFeature.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/TraceStructuralFeature.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/XYGraphStructuralFeature.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/XYGraphStructuralFeature.java
index c84fde8..600a36d 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/XYGraphStructuralFeature.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/src/org/eclipse/papyrus/moka/xygraph/model/reflection/XYGraphStructuralFeature.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/about.html b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
index c89dbae..9e7f8b1 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
@@ -5,4 +5,5 @@
                plugin.xml,\
                icons/,\
                resources/,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/Activator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/Activator.java
index 309657f..c8a0ef4 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/Activator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/EmptyListQuery.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/EmptyListQuery.java
index c5098ba..811e613 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/EmptyListQuery.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/EmptyListQuery.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetContainedXYGraphs.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetContainedXYGraphs.java
index d71522c..9460605 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetContainedXYGraphs.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetContainedXYGraphs.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetXYGraphIcon.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetXYGraphIcon.java
index faaae8e..ced97b1 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetXYGraphIcon.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/GetXYGraphIcon.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/IsXYGraphContainer.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/IsXYGraphContainer.java
index d871f26..0768552 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/IsXYGraphContainer.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/src/org/eclipse/papyrus/moka/xygraph/modelexplorer/queries/IsXYGraphContainer.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/about.html b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/about.html
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/Activator.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/Activator.java
index f4b3c2b..62d3ef0 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/Activator.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/constraints/IsXYGraphConstraint.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/constraints/IsXYGraphConstraint.java
index 65e3152..d7f11d5 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/constraints/IsXYGraphConstraint.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/constraints/IsXYGraphConstraint.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/VisibleTracesContentProvider.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/VisibleTracesContentProvider.java
index 52e98d7..2c41fd6 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/VisibleTracesContentProvider.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/VisibleTracesContentProvider.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElement.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElement.java
index 73718db..26bce44 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElement.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElement.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElementFactory.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElementFactory.java
index 15f04de..7450efa 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElementFactory.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/src/org/eclipse/papyrus/moka/xygraph/properties/modelelement/XYGraphModelElementFactory.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  David LOPEZ BETANCUR (CEA LIST)
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/about.html b/bundles/core/ui/org.eclipse.papyrus.moka.ui/about.html
index d35d5ae..8d57930 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/about.html
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java
index 00a146a..c027418 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/Activator.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/Activator.java
index 9e0c336..06872ac 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/Activator.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.java
index ecab8fa..e47d358 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/DebugAsHandler.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/DebugAsHandler.java
index 9fe9e69..b360b47 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/DebugAsHandler.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/DebugAsHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.java
index a38d17b..d37ad26 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/RunAsHandler.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/RunAsHandler.java
index 9fdfb76..5b3d7f0 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/RunAsHandler.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/RunAsHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java
index b3509e0..e7941af 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java
index 69a8e7d..3082738 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaAdditionalSemanticsSelectionComponent.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaAdditionalSemanticsSelectionComponent.java
index 0400b50..cf8a3ed 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaAdditionalSemanticsSelectionComponent.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaAdditionalSemanticsSelectionComponent.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaComboBox.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaComboBox.java
index 16cd621..266d743 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaComboBox.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaComboBox.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutableElementSelection.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutableElementSelection.java
index 0596b03..f48070d 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutableElementSelection.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutableElementSelection.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutableSelectionComponent.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutableSelectionComponent.java
index 32c04f2..db2b156 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutableSelectionComponent.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutableSelectionComponent.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineComboBox.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineComboBox.java
index 8215300..98c767e 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineComboBox.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineComboBox.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineSelection.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineSelection.java
index 765dc0d..77c23b2 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineSelection.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineSelection.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineSelectionComponent.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineSelectionComponent.java
index baf3cd1..757efec 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineSelectionComponent.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaExecutionEngineSelectionComponent.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaGroupComponent.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaGroupComponent.java
index 0585496..6a63345 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaGroupComponent.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaGroupComponent.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.java
index f3b82b1..759408b 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaLibrariesComboBox.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaLibrariesComboBox.java
index 73ff9fe..6e7b599 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaLibrariesComboBox.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaLibrariesComboBox.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaProjectSelection.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaProjectSelection.java
index 6e983de..bf8e326 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaProjectSelection.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaProjectSelection.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaProjectSelectionComponent.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaProjectSelectionComponent.java
index c52165a..0b320e6 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaProjectSelectionComponent.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaProjectSelectionComponent.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaRunConfigurationTab.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaRunConfigurationTab.java
index ceb5c2b..04a1c1a 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaRunConfigurationTab.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaRunConfigurationTab.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaTriggerComboPopulation.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaTriggerComboPopulation.java
index 0cff107..f5c6a39 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaTriggerComboPopulation.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaTriggerComboPopulation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaUMLComboBox.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaUMLComboBox.java
index 0958f08..ce0eb88 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaUMLComboBox.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/MokaUMLComboBox.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/perspectives/debug/MokaDebugPerspective.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/perspectives/debug/MokaDebugPerspective.java
index 95b8340..d2ebb89 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/perspectives/debug/MokaDebugPerspective.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/perspectives/debug/MokaDebugPerspective.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.java
index e38a29c..eeb8595 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.java b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.java
index 17cb595..8fbe2b3 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.java
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/about.html b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/about.html
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/Activator.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/Activator.java
index 28a616b..6d330fc 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/Activator.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/Activator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2CausalityType.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2CausalityType.java
index 9483c2e..99a9057 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2CausalityType.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2CausalityType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2DependencyKind.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2DependencyKind.java
index 392992f..26d9d41 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2DependencyKind.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2DependencyKind.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2InitialType.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2InitialType.java
index 2c751a0..7bc4477 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2InitialType.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2InitialType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
index 7f4dd15..9cfbc98 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Port.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Port.java
index 6ecdd1f..b87f73a 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Port.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Port.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2ScalarVariable.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2ScalarVariable.java
index 31a13b9..edac8e5 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2ScalarVariable.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2ScalarVariable.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Type.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Type.java
index d6622fa..7bb74bf 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Type.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Type.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariabilityType.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariabilityType.java
index 82637ee..380df04 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariabilityType.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariabilityType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariableType.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariableType.java
index 4ec54a2..ca97812 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariableType.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2VariableType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmuproxy/Fmu2ProxyService.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmuproxy/Fmu2ProxyService.java
index fa08cd3..40d6708 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmuproxy/Fmu2ProxyService.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmuproxy/Fmu2ProxyService.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2AllocatorImpl.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2AllocatorImpl.java
index b987d95..95188ba 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2AllocatorImpl.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2AllocatorImpl.java
@@ -3,9 +3,11 @@
   * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2Callbacks.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2Callbacks.java
index d5c5990..019c3fa 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2Callbacks.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2Callbacks.java
@@ -3,30 +3,17 @@
   * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
  * 
  *****************************************************************************/
-
 package org.eclipse.papyrus.moka.fmi.master.jnr;
-/*****************************************************************************
- * 
-  * Copyright (c) 2016 CEA LIST.
- * 
- * 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
- *
- * Contributors:
- *  CEA LIST Initial API and implementation
- * 
- *****************************************************************************/
-
 
 import org.eclipse.papyrus.moka.fmi.master.jnr.JNRFMUInterface.Fmi2Status;
 
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2FreeMemImpl.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2FreeMemImpl.java
index 9d416e4..56abfc7 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2FreeMemImpl.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/FMI2FreeMemImpl.java
@@ -3,9 +3,11 @@
   * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/JNRFMUInterface.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/JNRFMUInterface.java
index 3a08816..39c1fc5 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/JNRFMUInterface.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/JNRFMUInterface.java
@@ -3,9 +3,11 @@
   * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/SimpleFMI2LoggerImpl.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/SimpleFMI2LoggerImpl.java
index 064892e..9f64e17 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/SimpleFMI2LoggerImpl.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/jnr/SimpleFMI2LoggerImpl.java
@@ -3,9 +3,11 @@
   * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/CoSimEnvironment.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/CoSimEnvironment.java
index 23c2bbb..646f16f 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/CoSimEnvironment.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/CoSimEnvironment.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/DependencyGraph.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/DependencyGraph.java
index 629b8ef..4c06381 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/DependencyGraph.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/DependencyGraph.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Edge.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Edge.java
index aa50843..4c91693 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Edge.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Edge.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Experiments.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Experiments.java
index eeef7e0..92240b1 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Experiments.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Experiments.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Node.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Node.java
index 2829465..43c34f2 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Node.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterlibrary/Node.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyService.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyService.java
index 241bfe1..fef6bd7 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyService.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyService.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceFactory.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceFactory.java
index b3dcc37..71d8f36 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceFactory.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceRegistery.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceRegistery.java
index 5f51e82..3f60b99 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceRegistery.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/masterproxy/Master2ProxyServiceRegistery.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/about.html b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/about.html
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/Activator.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/Activator.java
index 440ede0..3368f25 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/Activator.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/FMUDebugDialog.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/FMUDebugDialog.java
index 955273b..ffb74e8 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/FMUDebugDialog.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/FMUDebugDialog.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/MokaEngineForFMUDebug.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/MokaEngineForFMUDebug.java
index 10a70cb..09ce74f 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/MokaEngineForFMUDebug.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/src/org/eclipse/papyrus/moka/fmu/engine/debug/MokaEngineForFMUDebug.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/about.html b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/about.html
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/AbstractFMU.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/AbstractFMU.java
index 8858aea..df8faf2 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/AbstractFMU.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/AbstractFMU.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/FMUInterface.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/FMUInterface.java
index e76f8d1..a58a71f 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/FMUInterface.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/communication/FMUInterface.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/control/queue/FMIRootExecution.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/control/queue/FMIRootExecution.java
index 99ee518..f56035d 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/control/queue/FMIRootExecution.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/control/queue/FMIRootExecution.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2017 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/Activator.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/Activator.java
index 968c000..151944f 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/Activator.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/MokaEngineForFMUExport.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/MokaEngineForFMUExport.java
index 5a18f13..8f75a77 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/MokaEngineForFMUExport.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/MokaEngineForFMUExport.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/EngineStatus.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/EngineStatus.java
index 6f14b2c..9010a75 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/EngineStatus.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/EngineStatus.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/FMUControlService.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/FMUControlService.java
index dc8ec65..1bf244b 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/FMUControlService.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/control/FMUControlService.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMIPushPullStrategy.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMIPushPullStrategy.java
index 95ffed1..d0ceda0 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMIPushPullStrategy.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMIPushPullStrategy.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMUStepEnd.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMUStepEnd.java
index b869acc..c7187f8 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMUStepEnd.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/de/FMUStepEnd.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUAddStructuralFeatureValueAction.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUAddStructuralFeatureValueAction.java
index c20422a..bf15cdf 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUAddStructuralFeatureValueAction.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUAddStructuralFeatureValueAction.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUChangeEventOccurence.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUChangeEventOccurence.java
index a38d845..02bd9b2 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUChangeEventOccurence.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUChangeEventOccurence.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUConstructStrategy.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUConstructStrategy.java
index 1633791..1a56b8e 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUConstructStrategy.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUConstructStrategy.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUExecutionFactory.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUExecutionFactory.java
index 4976945..8cc7245 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUExecutionFactory.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUExecutionFactory.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMULocus.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMULocus.java
index 1adb2bf..85854d8 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMULocus.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMULocus.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUObject.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUObject.java
index 34ab1ac..ab7c52d 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUObject.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMUObject.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMU_ObjectActivation.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMU_ObjectActivation.java
index fb91b57..8c15abf 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMU_ObjectActivation.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/semantics/FMU_ObjectActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/utils/FMUEngineUtils.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/utils/FMUEngineUtils.java
index ce03b70..13791ba 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/utils/FMUEngineUtils.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/engine/utils/FMUEngineUtils.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONRequest.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONRequest.java
index a155cd0..5fab91d 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONRequest.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONRequest.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONResponse.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONResponse.java
index 7f59fc1..3053fd9 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONResponse.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONResponse.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONSocketClient.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONSocketClient.java
index d904c3f..b4b64ff 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONSocketClient.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/src/org/eclipse/papyrus/moka/fmu/json/JSONSocketClient.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/about.html b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/about.html
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationExecutionEngine.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationExecutionEngine.java
index 05c6447..6057fb8 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationExecutionEngine.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationExecutionEngine.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2015 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationFactory.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationFactory.java
index e9b57ba..edd2d23 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationFactory.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/CosimulationFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationAddStructuralFeatureValueActionActivation.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationAddStructuralFeatureValueActionActivation.java
index b651902..ef14c65 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationAddStructuralFeatureValueActionActivation.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationAddStructuralFeatureValueActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationDefaultConstructStrategy.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationDefaultConstructStrategy.java
index dc61656..eec8392 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationDefaultConstructStrategy.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationDefaultConstructStrategy.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationInstanceValueEvaluation.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationInstanceValueEvaluation.java
index 43fa69c..83303fe 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationInstanceValueEvaluation.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationInstanceValueEvaluation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationLocus.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationLocus.java
index cf461d2..7c87307 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationLocus.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationLocus.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationReadStructuralFeatureActionActivation.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationReadStructuralFeatureActionActivation.java
index 47ae6e5..f7c4101 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationReadStructuralFeatureActionActivation.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/src/org/eclipse/papyrus/moka/fuml/cosimulation/semantics/CosimulationReadStructuralFeatureActionActivation.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/about.html b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/about.html
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel
index f2a6ba6..948f91d 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
-    copyrightText="Copyright (c) 2016 CEA LIST.&#xA;&#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; Contributors:&#xA;  CEA LIST - Initial API and implementation"
+    copyrightText="Copyright (c) 2016 CEA LIST.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0 &#xD;&#xA;&#xD;&#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA;  CEA LIST - Initial API and implementation"
     modelDirectory="/org.eclipse.papyrus.moka.fmi.profile/src-gen" modelPluginID="org.eclipse.papyrus.moka.fmi.profile"
     modelName="FMI" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/plugin.properties b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/plugin.properties
index 9ce1d7b..d607a7d 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/plugin.properties
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/plugin.properties
@@ -1,9 +1,11 @@
 # Copyright (c) 2016 CEA LIST.
 # 
 #  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
+#  are made available under the terms of the Eclipse Public License 2.0
 #  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#  https://www.eclipse.org/legal/epl-2.0.html/
+#
+#  SPDX-License-Identifier: EPL-2.0
 # 
 #  Contributors:
 #   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/AbstractVariable.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/AbstractVariable.java
index a15b591..63a01ad 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/AbstractVariable.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/AbstractVariable.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/BaseUnit.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/BaseUnit.java
index d0a5182..3c361cb 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/BaseUnit.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/BaseUnit.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_FMU.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_FMU.java
index 142d3b6..71225be 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_FMU.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_FMU.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_Graph.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_Graph.java
index 1b37d1d..f77adca 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_Graph.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CS_Graph.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CalculatedParameter.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CalculatedParameter.java
index bf7d8f2..837acea 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CalculatedParameter.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CalculatedParameter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CausalityKind.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CausalityKind.java
index b9733a4..da37514 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CausalityKind.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/CausalityKind.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DependenciesKind.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DependenciesKind.java
index dbb26fc..9d57a34 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DependenciesKind.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DependenciesKind.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeDependency.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeDependency.java
index 798a4e7..cf8d6a9 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeDependency.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeDependency.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeUnknown.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeUnknown.java
index 6efb51e..effdf2d 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeUnknown.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/DerivativeUnknown.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIPort.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIPort.java
index 0929d46..94df9dc 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIPort.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIPort.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfileFactory.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfileFactory.java
index 84ee4c2..a2ded09 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfileFactory.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfileFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfilePackage.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfilePackage.java
index ec3d20a..c529fd7 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfilePackage.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMIProfilePackage.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMU.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMU.java
index ae3fdba..ebbfbfa 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMU.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FMU.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FlowDirection.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FlowDirection.java
index 28fca5b..e9630b1 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FlowDirection.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/FlowDirection.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Independent.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Independent.java
index 901660a..d4afc91 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Independent.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Independent.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialKind.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialKind.java
index 3368635..61addd9 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialKind.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialKind.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknown.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknown.java
index b8f60ca..fe20c95 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknown.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknown.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknownDependency.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknownDependency.java
index 5228116..4202675 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknownDependency.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/InitialUnknownDependency.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Local.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Local.java
index 402fcd0..d2b20d8 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Local.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Local.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ME_FMU.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ME_FMU.java
index 5e301be..b7a8b69 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ME_FMU.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ME_FMU.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputDependency.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputDependency.java
index 81c101d..dbe8675 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputDependency.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputDependency.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputUnknown.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputUnknown.java
index 19cae9a..57c4b53 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputUnknown.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/OutputUnknown.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Parameter.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Parameter.java
index b80457f..a4306d2 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Parameter.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Parameter.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Port.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Port.java
index 7d4d680..b5a41ea 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Port.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Port.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ScalarVariable.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ScalarVariable.java
index 1c1aa4a..8bbe30e 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ScalarVariable.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/ScalarVariable.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Unknown.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Unknown.java
index 1081e2a..7bae16a 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Unknown.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/Unknown.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityKind.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityKind.java
index 3a64da3..61b822c 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityKind.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityKind.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityNamingConvention.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityNamingConvention.java
index 34a920a..c06fb07 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityNamingConvention.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/VariabilityNamingConvention.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/AbstractVariableImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/AbstractVariableImpl.java
index 0e86a44..ade654c 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/AbstractVariableImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/AbstractVariableImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_FMUImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_FMUImpl.java
index 49cc745..1a5ad52 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_FMUImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_FMUImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_GraphImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_GraphImpl.java
index d3837f6..aa3167c 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_GraphImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CS_GraphImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CalculatedParameterImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CalculatedParameterImpl.java
index a0a616b..38dd96a 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CalculatedParameterImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/CalculatedParameterImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeDependencyImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeDependencyImpl.java
index 15b04bc..97c89c5 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeDependencyImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeDependencyImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeUnknownImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeUnknownImpl.java
index c251e77..1f50fa3 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeUnknownImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/DerivativeUnknownImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIPortImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIPortImpl.java
index f17c87e..2a21998 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIPortImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIPortImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfileFactoryImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfileFactoryImpl.java
index c9fa241..e70c3d7 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfileFactoryImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfileFactoryImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfilePackageImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfilePackageImpl.java
index bb99553..eeba0bb 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfilePackageImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMIProfilePackageImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMUImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMUImpl.java
index 2f5f3b7..3c33bab 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMUImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/FMUImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/IndependentImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/IndependentImpl.java
index 53f0289..66bcf03 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/IndependentImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/IndependentImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownDependencyImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownDependencyImpl.java
index 1557b31..ea09109 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownDependencyImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownDependencyImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownImpl.java
index 29bca18..f7b7276 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/InitialUnknownImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/LocalImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/LocalImpl.java
index 8252801..b09a457 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/LocalImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/LocalImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ME_FMUImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ME_FMUImpl.java
index 461c65a..f6f174c 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ME_FMUImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ME_FMUImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputDependencyImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputDependencyImpl.java
index a69dda9..b7f74bd 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputDependencyImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputDependencyImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputUnknownImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputUnknownImpl.java
index 19fd66b..7b703d3 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputUnknownImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/OutputUnknownImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ParameterImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ParameterImpl.java
index f332bca..670aea3 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ParameterImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ParameterImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/PortImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/PortImpl.java
index 3634f18..8f9812f 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/PortImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/PortImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ScalarVariableImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ScalarVariableImpl.java
index e705a3c..1d57476 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ScalarVariableImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/ScalarVariableImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/UnknownImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/UnknownImpl.java
index 249f2b6..a4ab462 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/UnknownImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/impl/UnknownImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileAdapterFactory.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileAdapterFactory.java
index 965cae1..bc10705 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileAdapterFactory.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileAdapterFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileSwitch.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileSwitch.java
index 6f05d6f..2d4577f 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileSwitch.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src-gen/org/eclipse/papyrus/moka/fmi/fmiprofile/util/FMIProfileSwitch.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCS_FMU.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCS_FMU.java
index 61ba815..9d11727 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCS_FMU.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCS_FMU.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCalculatedParameter.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCalculatedParameter.java
index 6ee4ed9..06f80b5 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCalculatedParameter.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomCalculatedParameter.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016,2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIPort.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIPort.java
index e34f008..65294ac 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIPort.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIPort.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016,2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIProfileFactory.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIProfileFactory.java
index 91cab68..84a9717 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIProfileFactory.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMIProfileFactory.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMU.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMU.java
index 1db108d..64c0828 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMU.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomFMU.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomIndependant.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomIndependant.java
index 6eb9340..a8c5f2c 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomIndependant.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomIndependant.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomLocal.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomLocal.java
index 3ec8d33..072a7f3 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomLocal.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomLocal.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomME_FMU.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomME_FMU.java
index 90ce3b5..001d8be 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomME_FMU.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomME_FMU.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomParameter.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomParameter.java
index 5829256..9660f8a 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomParameter.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomParameter.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomPort.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomPort.java
index fab8520..98f8eb7 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomPort.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/custom/CustomPort.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FMIProfileUtil.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FMIProfileUtil.java
index b0e6db3..9e9a70b 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FMIProfileUtil.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FMIProfileUtil.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FastUMLUtil.java b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FastUMLUtil.java
index fd313aa..41ecf83 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FastUMLUtil.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/src/org/eclipse/papyrus/moka/fmi/profile/util/FastUMLUtil.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/about.html b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/about.html
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.genmodel b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.genmodel
index f26c07a..23543b6 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.genmodel
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/OMSimulator.profile.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
-    copyrightText="Copyright (c) 2018 CEA LIST.&#xA;&#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; Contributors:&#xA;  CEA LIST - Initial API and implementation"
+    copyrightText="Copyright (c) 2018 CEA LIST.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0 &#xD;&#xA;&#xD;&#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA;  CEA LIST - Initial API and implementation"
     modelDirectory="/org.eclipse.papyrus.moka.ssp.profile/src-gen" modelPluginID="org.eclipse.papyrus.moka.ssp.profile"
     modelName="OMSimulator" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.genmodel b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.genmodel
index 99f408b..fdcf40e 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.genmodel
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/model.profile.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
-    copyrightText=" Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.&#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;Contributors:&#xA; IncQuery Labs Ltd - initial API and implementation&#xA; CEA List "
+    copyrightText=" Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.&#xA; All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License 2.0&#xA;which accompanies this distribution, and is available at&#xA;https://www.eclipse.org/legal/epl-2.0 &#xD;&#xA;&#xD;&#xA;SPDX-License-Identifier: EPL-2.0&#xA; &#xA;Contributors:&#xA; IncQuery Labs Ltd - initial API and implementation&#xA; CEA List "
     modelDirectory="/org.eclipse.papyrus.moka.ssp.profile/src-gen" modelPluginID="org.eclipse.papyrus.moka.ssp.profile"
     modelName="Model" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     testsDirectory="" importerID="org.eclipse.uml2.uml.ecore.importer" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.moka.fmi.profile/model/FMI.profile.genmodel#//fmiprofile ../../org.eclipse.uml2.uml.profile.standard/model/Standard.genmodel#//standard ../../org.eclipse.papyrus.sysml14/resources/profile/SysML.profile.genmodel#//sysml14 ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml ../../org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.genmodel#//modeldescription ../../org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel#//fmumetamodel"
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/scripts/create_tlm_interfaces.py b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/scripts/create_tlm_interfaces.py
index db402be..198d302 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/scripts/create_tlm_interfaces.py
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/model/scripts/create_tlm_interfaces.py
@@ -2,9 +2,11 @@
 # Copyright (c) 2019 CEA LIST.
 # 
 #   All rights reserved. This program and the accompanying materials
-#   are made available under the terms of the Eclipse Public License v1.0
+#   are made available under the terms of the Eclipse Public License 2.0
 #   which accompanies this distribution, and is available at
-#   http://www.eclipse.org/legal/epl-v10.html
+#   https://www.eclipse.org/legal/epl-2.0/
+#
+#   SPDX-License-Identifier: EPL-2.0
 #  
 #   Contributors:
 #    CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnectionEnd.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnectionEnd.java
index 9117413..026549d 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnectionEnd.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnectionEnd.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -48,7 +50,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Base Connector End</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnector.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnector.java
index d02de8e..607763b 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnector.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/BusConnector.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -46,7 +48,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Base Connector</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/Interpolation.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/Interpolation.java
index 0ec6c40..b75cb67 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/Interpolation.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/Interpolation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -62,7 +64,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The '<em><b>None</b></em>' literal value.
@@ -221,7 +223,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public int getValue() {
 	  return value;
 	}
@@ -231,7 +232,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public String getName() {
 	  return name;
 	}
@@ -241,7 +241,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public String getLiteral() {
 	  return literal;
 	}
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorBus.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorBus.java
index 560242e..436f9fb 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorBus.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorBus.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -46,7 +48,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorFactory.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorFactory.java
index dd1692f..b075786 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorFactory.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -27,7 +29,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The singleton instance of the factory.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorPackage.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorPackage.java
index f8bf574..d54e9cd 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorPackage.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/OMSimulatorPackage.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -41,7 +43,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The package name.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMConnection.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMConnection.java
index c901af7..e0d22d7 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMConnection.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMConnection.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -41,7 +43,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Timedelay</b></em>' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMDomain.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMDomain.java
index 5efafa2..1a38c5b 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMDomain.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMDomain.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -92,7 +94,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The '<em><b>Hydraulic</b></em>' literal value.
@@ -302,7 +304,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public int getValue() {
 	  return value;
 	}
@@ -312,7 +313,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public String getName() {
 	  return name;
 	}
@@ -322,7 +322,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public String getLiteral() {
 	  return literal;
 	}
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMInterfaceDefinition.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMInterfaceDefinition.java
index f9b9b9d..13c9ae1 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMInterfaceDefinition.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMInterfaceDefinition.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -50,7 +52,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Interpolation</b></em>' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignal.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignal.java
index a43cc6d..5aaa3a8 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignal.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignal.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -42,7 +44,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignalDefinition.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignalDefinition.java
index 6b8fbde..2b61577 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignalDefinition.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/TLMSignalDefinition.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -37,7 +39,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Returns the value of the '<em><b>Base Port</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectionEndImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectionEndImpl.java
index 0e12d67..31df001 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectionEndImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectionEndImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -52,7 +54,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getBase_ConnectorEnd() <em>Base Connector End</em>}' reference.
@@ -98,7 +100,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public ConnectorEnd getBase_ConnectorEnd() {
 		if (base_ConnectorEnd != null && base_ConnectorEnd.eIsProxy()) {
 			InternalEObject oldBase_ConnectorEnd = (InternalEObject)base_ConnectorEnd;
@@ -125,7 +126,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setBase_ConnectorEnd(ConnectorEnd newBase_ConnectorEnd) {
 		ConnectorEnd oldBase_ConnectorEnd = base_ConnectorEnd;
 		base_ConnectorEnd = newBase_ConnectorEnd;
@@ -138,7 +138,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EList<Port> getReferencedSignal() {
 		if (referencedSignal == null) {
 			referencedSignal = new EObjectResolvingEList<Port>(Port.class, this, OMSimulatorPackage.BUS_CONNECTION_END__REFERENCED_SIGNAL);
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectorImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectorImpl.java
index 1fe39b9..2c1bb5d 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectorImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/BusConnectorImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -22,10 +24,12 @@
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
 import org.eclipse.papyrus.moka.ssp.omsimulatorprofile.BusConnector;
 import org.eclipse.papyrus.moka.ssp.omsimulatorprofile.OMSimulatorPackage;
 
 import org.eclipse.papyrus.moka.ssp.omsimulatorprofile.operations.BusConnectorOperations;
+
 import org.eclipse.uml2.uml.Connector;
 import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.Property;
@@ -54,7 +58,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.
@@ -90,7 +94,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Connector getBase_Connector() {
 		if (base_Connector != null && base_Connector.eIsProxy()) {
 			InternalEObject oldBase_Connector = (InternalEObject)base_Connector;
@@ -117,7 +120,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setBase_Connector(Connector newBase_Connector) {
 		Connector oldBase_Connector = base_Connector;
 		base_Connector = newBase_Connector;
@@ -130,7 +132,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Property getEnd1Component() {
 		Property end1Component = basicGetEnd1Component();
 		return end1Component != null && end1Component.eIsProxy() ? (Property)eResolveProxy((InternalEObject)end1Component) : end1Component;
@@ -150,7 +151,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setEnd1Component(Property newEnd1Component) {
 		// TODO: implement this method to set the 'End1 Component' reference
 		// Ensure that you remove @generated or mark it @generated NOT
@@ -162,7 +162,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EList<Port> getEnd1Signals() {
 		return BusConnectorOperations.getEnd1Signals(this);
 	}
@@ -197,7 +196,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EList<Port> getEnd2Signals() {
 		return BusConnectorOperations.getEnd2Signals(this);
 	}
@@ -232,7 +230,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Property getEnd2Component() {
 		Property end2Component = basicGetEnd2Component();
 		return end2Component != null && end2Component.eIsProxy() ? (Property)eResolveProxy((InternalEObject)end2Component) : end2Component;
@@ -252,7 +249,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setEnd2Component(Property newEnd2Component) {
 		// TODO: implement this method to set the 'End2 Component' reference
 		// Ensure that you remove @generated or mark it @generated NOT
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorBusImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorBusImpl.java
index 8cd3325..f35ccf4 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorBusImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorBusImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -29,6 +31,7 @@
 import org.eclipse.papyrus.moka.ssp.omsimulatorprofile.OMSimulatorBus;
 import org.eclipse.papyrus.moka.ssp.omsimulatorprofile.OMSimulatorPackage;
 import org.eclipse.papyrus.moka.ssp.omsimulatorprofile.TLMDomain;
+
 import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.Type;
 
@@ -53,7 +56,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
@@ -109,7 +112,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Port getBase_Port() {
 		if (base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
@@ -136,7 +138,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
@@ -149,7 +150,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EList<Port> getSignals() {
 		if (signals == null) {
 			signals = new EObjectResolvingEList<Port>(Port.class, this, OMSimulatorPackage.OM_SIMULATOR_BUS__SIGNALS);
@@ -187,7 +187,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EList<TLMDomain> getDomain() {
 		if (domain == null) {
 			domain = new EDataTypeUniqueEList<TLMDomain>(TLMDomain.class, this, OMSimulatorPackage.OM_SIMULATOR_BUS__DOMAIN);
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorFactoryImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorFactoryImpl.java
index 08e930f..03bf09a 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorFactoryImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorFactoryImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -34,7 +36,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * Creates the default factory implementation.
@@ -124,7 +126,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public TLMInterfaceDefinition createTLMInterfaceDefinition() {
 		TLMInterfaceDefinitionImpl tlmInterfaceDefinition = new TLMInterfaceDefinitionImpl();
 		return tlmInterfaceDefinition;
@@ -135,7 +136,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public TLMSignalDefinition createTLMSignalDefinition() {
 		TLMSignalDefinitionImpl tlmSignalDefinition = new TLMSignalDefinitionImpl();
 		return tlmSignalDefinition;
@@ -146,7 +146,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public TLMSignal createTLMSignal() {
 		TLMSignalImpl tlmSignal = new TLMSignalImpl();
 		return tlmSignal;
@@ -157,7 +156,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public OMSimulatorBus createOMSimulatorBus() {
 		OMSimulatorBusImpl omSimulatorBus = new OMSimulatorBusImpl();
 		return omSimulatorBus;
@@ -168,7 +166,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public BusConnectionEnd createBusConnectionEnd() {
 		BusConnectionEndImpl busConnectionEnd = new BusConnectionEndImpl();
 		return busConnectionEnd;
@@ -179,7 +176,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public TLMConnection createTLMConnection() {
 		TLMConnectionImpl tlmConnection = new TLMConnectionImpl();
 		return tlmConnection;
@@ -190,7 +186,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public BusConnector createBusConnector() {
 		BusConnectorImpl busConnector = new BusConnectorImpl();
 		return busConnector;
@@ -241,7 +236,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public OMSimulatorPackage getOMSimulatorPackage() {
 		return (OMSimulatorPackage)getEPackage();
 	}
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorPackageImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorPackageImpl.java
index c4f0665..b105c26 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorPackageImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/OMSimulatorPackageImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -49,7 +51,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -185,7 +187,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getTLMInterfaceDefinition() {
 		return tlmInterfaceDefinitionEClass;
 	}
@@ -195,7 +196,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getTLMInterfaceDefinition_Interpolation() {
 		return (EAttribute)tlmInterfaceDefinitionEClass.getEStructuralFeatures().get(0);
 	}
@@ -205,7 +205,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getTLMInterfaceDefinition_Base_Interface() {
 		return (EReference)tlmInterfaceDefinitionEClass.getEStructuralFeatures().get(1);
 	}
@@ -215,7 +214,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getTLMInterfaceDefinition_Base_Class() {
 		return (EReference)tlmInterfaceDefinitionEClass.getEStructuralFeatures().get(2);
 	}
@@ -225,7 +223,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getTLMInterfaceDefinition_SignalDefinitions() {
 		return (EReference)tlmInterfaceDefinitionEClass.getEStructuralFeatures().get(3);
 	}
@@ -235,7 +232,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getTLMInterfaceDefinition_Dimensions() {
 		return (EAttribute)tlmInterfaceDefinitionEClass.getEStructuralFeatures().get(4);
 	}
@@ -245,7 +241,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EOperation getTLMInterfaceDefinition__GetSignalDefinitions() {
 		return tlmInterfaceDefinitionEClass.getEOperations().get(0);
 	}
@@ -255,7 +250,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getTLMSignalDefinition() {
 		return tlmSignalDefinitionEClass;
 	}
@@ -265,7 +259,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getTLMSignalDefinition_Base_Port() {
 		return (EReference)tlmSignalDefinitionEClass.getEStructuralFeatures().get(0);
 	}
@@ -275,7 +268,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getTLMSignal() {
 		return tlmSignalEClass;
 	}
@@ -285,7 +277,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getTLMSignal_Base_Port() {
 		return (EReference)tlmSignalEClass.getEStructuralFeatures().get(0);
 	}
@@ -295,7 +286,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getTLMSignal_Definition() {
 		return (EReference)tlmSignalEClass.getEStructuralFeatures().get(1);
 	}
@@ -305,7 +295,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getOMSimulatorBus() {
 		return omSimulatorBusEClass;
 	}
@@ -315,7 +304,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getOMSimulatorBus_Base_Port() {
 		return (EReference)omSimulatorBusEClass.getEStructuralFeatures().get(0);
 	}
@@ -325,7 +313,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getOMSimulatorBus_Signals() {
 		return (EReference)omSimulatorBusEClass.getEStructuralFeatures().get(1);
 	}
@@ -335,7 +322,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getOMSimulatorBus_Domain() {
 		return (EAttribute)omSimulatorBusEClass.getEStructuralFeatures().get(2);
 	}
@@ -345,7 +331,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getBusConnectionEnd() {
 		return busConnectionEndEClass;
 	}
@@ -355,7 +340,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getBusConnectionEnd_Base_ConnectorEnd() {
 		return (EReference)busConnectionEndEClass.getEStructuralFeatures().get(0);
 	}
@@ -365,7 +349,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getBusConnectionEnd_ReferencedSignal() {
 		return (EReference)busConnectionEndEClass.getEStructuralFeatures().get(1);
 	}
@@ -375,7 +358,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getTLMConnection() {
 		return tlmConnectionEClass;
 	}
@@ -385,7 +367,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getTLMConnection_Timedelay() {
 		return (EAttribute)tlmConnectionEClass.getEStructuralFeatures().get(0);
 	}
@@ -395,7 +376,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getTLMConnection_Impedance() {
 		return (EAttribute)tlmConnectionEClass.getEStructuralFeatures().get(1);
 	}
@@ -405,7 +385,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getTLMConnection_Rotationalimpedance() {
 		return (EAttribute)tlmConnectionEClass.getEStructuralFeatures().get(2);
 	}
@@ -415,7 +394,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EAttribute getTLMConnection_Alpha() {
 		return (EAttribute)tlmConnectionEClass.getEStructuralFeatures().get(3);
 	}
@@ -425,7 +403,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getTLMConnection_Base_Connector() {
 		return (EReference)tlmConnectionEClass.getEStructuralFeatures().get(4);
 	}
@@ -435,7 +412,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EClass getBusConnector() {
 		return busConnectorEClass;
 	}
@@ -445,7 +421,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getBusConnector_Base_Connector() {
 		return (EReference)busConnectorEClass.getEStructuralFeatures().get(0);
 	}
@@ -455,7 +430,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getBusConnector_End1Component() {
 		return (EReference)busConnectorEClass.getEStructuralFeatures().get(1);
 	}
@@ -465,7 +439,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getBusConnector_End1Signals() {
 		return (EReference)busConnectorEClass.getEStructuralFeatures().get(2);
 	}
@@ -475,7 +448,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getBusConnector_End2Signals() {
 		return (EReference)busConnectorEClass.getEStructuralFeatures().get(3);
 	}
@@ -485,7 +457,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EReference getBusConnector_End2Component() {
 		return (EReference)busConnectorEClass.getEStructuralFeatures().get(4);
 	}
@@ -495,7 +466,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EOperation getBusConnector__GetEnd1Component() {
 		return busConnectorEClass.getEOperations().get(0);
 	}
@@ -505,7 +475,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EOperation getBusConnector__GetEnd2Component() {
 		return busConnectorEClass.getEOperations().get(1);
 	}
@@ -515,7 +484,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EOperation getBusConnector__GetEnd1Signals() {
 		return busConnectorEClass.getEOperations().get(2);
 	}
@@ -525,7 +493,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EOperation getBusConnector__GetEnd2Signals() {
 		return busConnectorEClass.getEOperations().get(3);
 	}
@@ -535,7 +502,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EEnum getInterpolation() {
 		return interpolationEEnum;
 	}
@@ -545,7 +511,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EEnum getTLMDomain() {
 		return tlmDomainEEnum;
 	}
@@ -555,7 +520,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public OMSimulatorFactory getOMSimulatorFactory() {
 		return (OMSimulatorFactory)getEFactoryInstance();
 	}
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMConnectionImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMConnectionImpl.java
index 9369821..29df3a5 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMConnectionImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMConnectionImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -47,7 +49,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The default value of the '{@link #getTimedelay() <em>Timedelay</em>}' attribute.
@@ -163,7 +165,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public double getTimedelay() {
 		return timedelay;
 	}
@@ -173,7 +174,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setTimedelay(double newTimedelay) {
 		double oldTimedelay = timedelay;
 		timedelay = newTimedelay;
@@ -186,7 +186,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public double getImpedance() {
 		return impedance;
 	}
@@ -196,7 +195,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setImpedance(double newImpedance) {
 		double oldImpedance = impedance;
 		impedance = newImpedance;
@@ -209,7 +207,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public double getRotationalimpedance() {
 		return rotationalimpedance;
 	}
@@ -219,7 +216,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setRotationalimpedance(double newRotationalimpedance) {
 		double oldRotationalimpedance = rotationalimpedance;
 		rotationalimpedance = newRotationalimpedance;
@@ -232,7 +228,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public double getAlpha() {
 		return alpha;
 	}
@@ -242,7 +237,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setAlpha(double newAlpha) {
 		double oldAlpha = alpha;
 		alpha = newAlpha;
@@ -255,7 +249,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Connector getBase_Connector() {
 		if (base_Connector != null && base_Connector.eIsProxy()) {
 			InternalEObject oldBase_Connector = (InternalEObject)base_Connector;
@@ -282,7 +275,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setBase_Connector(Connector newBase_Connector) {
 		Connector oldBase_Connector = base_Connector;
 		base_Connector = newBase_Connector;
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMInterfaceDefinitionImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMInterfaceDefinitionImpl.java
index 5766a6b..1fdca68 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMInterfaceDefinitionImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMInterfaceDefinitionImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -55,7 +57,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The default value of the '{@link #getInterpolation() <em>Interpolation</em>}' attribute.
@@ -141,7 +143,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Interpolation getInterpolation() {
 		return interpolation;
 	}
@@ -151,7 +152,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setInterpolation(Interpolation newInterpolation) {
 		Interpolation oldInterpolation = interpolation;
 		interpolation = newInterpolation == null ? INTERPOLATION_EDEFAULT : newInterpolation;
@@ -164,7 +164,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Interface getBase_Interface() {
 		if (base_Interface != null && base_Interface.eIsProxy()) {
 			InternalEObject oldBase_Interface = (InternalEObject)base_Interface;
@@ -191,7 +190,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setBase_Interface(Interface newBase_Interface) {
 		Interface oldBase_Interface = base_Interface;
 		base_Interface = newBase_Interface;
@@ -204,7 +202,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public org.eclipse.uml2.uml.Class getBase_Class() {
 		if (base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject)base_Class;
@@ -231,7 +228,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
 		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
 		base_Class = newBase_Class;
@@ -244,7 +240,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public EList<TLMSignalDefinition> getSignalDefinitions() {
 		return TLMInterfaceDefinitionOperations.getSignalDefinitions(this);
 	}
@@ -254,7 +249,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public int getDimensions() {
 		return dimensions;
 	}
@@ -264,7 +258,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setDimensions(int newDimensions) {
 		int oldDimensions = dimensions;
 		dimensions = newDimensions;
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalDefinitionImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalDefinitionImpl.java
index c0ef812..8281bab 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalDefinitionImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalDefinitionImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -43,7 +45,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
@@ -79,7 +81,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Port getBase_Port() {
 		if (base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
@@ -106,7 +107,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalImpl.java
index 63b02b9..c0aaa99 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/impl/TLMSignalImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -45,7 +47,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached value of the '{@link #getBase_Port() <em>Base Port</em>}' reference.
@@ -91,7 +93,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public Port getBase_Port() {
 		if (base_Port != null && base_Port.eIsProxy()) {
 			InternalEObject oldBase_Port = (InternalEObject)base_Port;
@@ -118,7 +119,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setBase_Port(Port newBase_Port) {
 		Port oldBase_Port = base_Port;
 		base_Port = newBase_Port;
@@ -131,7 +131,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public TLMSignalDefinition getDefinition() {
 		if (definition != null && definition.eIsProxy()) {
 			InternalEObject oldDefinition = (InternalEObject)definition;
@@ -158,7 +157,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setDefinition(TLMSignalDefinition newDefinition) {
 		TLMSignalDefinition oldDefinition = definition;
 		definition = newDefinition;
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorAdapterFactory.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorAdapterFactory.java
index 7a24717..f9674b0 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorAdapterFactory.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorAdapterFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -34,7 +36,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached model package.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorSwitch.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorSwitch.java
index 881c6a5..f214cd7 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorSwitch.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorSwitch.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -37,7 +39,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * The cached model package
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfileFactory.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfileFactory.java
index 5db3593..2fee858 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfileFactory.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfileFactory.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -27,7 +29,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The singleton instance of the factory.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfilePackage.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfilePackage.java
index f44fb53..e214c07 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfilePackage.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SSPProfilePackage.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -43,7 +45,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The package name.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/Ssd.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/Ssd.java
index 4d8f3c3..2e75757 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/Ssd.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/Ssd.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -38,7 +40,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdComponent.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdComponent.java
index eff6284..9de8931 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdComponent.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdComponent.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -40,7 +42,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * Returns the value of the '<em><b>Source</b></em>' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnection.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnection.java
index bd0d26d..12518f9 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnection.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnection.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -42,7 +44,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * Returns the value of the '<em><b>Base Connector</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnector.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnector.java
index b50b95d..eb8df7a 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnector.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnector.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -36,7 +38,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * Returns the value of the '<em><b>SSD Description</b></em>' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnectorAndFmiPort.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnectorAndFmiPort.java
index 9a2442e..7f1fecc 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnectorAndFmiPort.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdConnectorAndFmiPort.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -29,6 +31,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 } // SsdConnectorAndFmiPort
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdElement.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdElement.java
index 5979b61..943b3b3 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdElement.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdElement.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -35,7 +37,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * Returns the value of the '<em><b>ID</b></em>' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSignalDictionaryReference.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSignalDictionaryReference.java
index 5bc7ecd..d8a1e55 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSignalDictionaryReference.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSignalDictionaryReference.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -34,7 +36,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSystem.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSystem.java
index a98ba19..fa61679 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSystem.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/SsdSystem.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -34,7 +36,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/TypeKind.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/TypeKind.java
index 8f36011..727eb34 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/TypeKind.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/TypeKind.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -32,7 +34,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The '<em><b>Input</b></em>' literal value.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfileFactoryImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfileFactoryImpl.java
index 1f2726a..2b33c90 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfileFactoryImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfileFactoryImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -34,7 +36,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * Creates the default factory implementation.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfilePackageImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfilePackageImpl.java
index c5a95ce..33cd390 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfilePackageImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SSPProfilePackageImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -60,7 +62,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdComponentImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdComponentImpl.java
index f307ec2..0cee181 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdComponentImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdComponentImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -47,7 +49,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectionImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectionImpl.java
index d19d02f..db4b0fa 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectionImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectionImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -49,7 +51,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The cached value of the '{@link #getBase_Connector() <em>Base Connector</em>}' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorAndFmiPortImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorAndFmiPortImpl.java
index 010d194..04bb730 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorAndFmiPortImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorAndFmiPortImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -44,7 +46,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The default value of the '{@link #getSSDDescription() <em>SSD Description</em>}' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorImpl.java
index 96c7eaa..d7f6ccc 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdConnectorImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -43,7 +45,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The default value of the '{@link #getSSDDescription() <em>SSD Description</em>}' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdElementImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdElementImpl.java
index 2eb76ff..477f509 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdElementImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdElementImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -40,7 +42,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The default value of the '{@link #getID() <em>ID</em>}' attribute.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdImpl.java
index 99bfac2..6de537d 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -45,7 +47,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The cached value of the '{@link #getBase_Package() <em>Base Package</em>}' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSignalDictionaryReferenceImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSignalDictionaryReferenceImpl.java
index 5eba0c3..2314322 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSignalDictionaryReferenceImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSignalDictionaryReferenceImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -40,7 +42,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSystemImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSystemImpl.java
index 7aa7663..35118f5 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSystemImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/impl/SsdSystemImpl.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -40,7 +42,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileAdapterFactory.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileAdapterFactory.java
index 336170c..24360d4 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileAdapterFactory.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileAdapterFactory.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -39,7 +41,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The cached model package.
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileSwitch.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileSwitch.java
index 9bbafbf..e676752 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileSwitch.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src-gen/org/eclipse/papyrus/moka/ssp/profile/util/SSPProfileSwitch.java
@@ -1,9 +1,11 @@
 /**
  *  Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.
  *  All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *  
  * Contributors:
  *  IncQuery Labs Ltd - initial API and implementation
@@ -42,7 +44,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp://www.eclipse.org/legal/epl-v10.html\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
+	public static final String copyright = " Copyright (c) 2018,  IncQuery Labs Ltd and CEA List.\n All rights reserved. This program and the accompanying materials\nare made available under the terms of the Eclipse Public License 2.0\nwhich accompanies this distribution, and is available at\nhttps://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n \nContributors:\n IncQuery Labs Ltd - initial API and implementation\n CEA List ";
 
 	/**
 	 * The cached model package
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/BusConnectorOperations.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/BusConnectorOperations.java
index 8af4858..54874ac 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/BusConnectorOperations.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/BusConnectorOperations.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -47,7 +49,7 @@
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/TLMInterfaceDefinitionOperations.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/TLMInterfaceDefinitionOperations.java
index 8be99b7..909b500 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/TLMInterfaceDefinitionOperations.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/operations/TLMInterfaceDefinitionOperations.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2018 CEA LIST.
  * 
  *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
+ *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *   CEA LIST - Initial API and implementation
@@ -40,7 +42,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License v1.0\n which accompanies this distribution, and is available at\n http://www.eclipse.org/legal/epl-v10.html\n\n Contributors:\n  CEA LIST - Initial API and implementation";
+	String copyright = "Copyright (c) 2018 CEA LIST.\n\n All rights reserved. This program and the accompanying materials\n are made available under the terms of the Eclipse Public License 2.0\n which accompanies this distribution, and is available at\n https://www.eclipse.org/legal/epl-2.0 \r\n\r\nSPDX-License-Identifier: EPL-2.0\n\n Contributors:\n  CEA LIST - Initial API and implementation";
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorProfileUtil.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorProfileUtil.java
index c084aee..ce36895 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorProfileUtil.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/omsimulatorprofile/util/OMSimulatorProfileUtil.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2018 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
+ */
 package org.eclipse.papyrus.moka.ssp.omsimulatorprofile.util;
 
 import org.eclipse.emf.common.util.URI;
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/StereotypeStrings.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/StereotypeStrings.java
index 3dacabc..d02fc0a 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/StereotypeStrings.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/StereotypeStrings.java
@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2018 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
+ * 
+ *  Contributors:
+ *   CEA LIST - Initial API and implementation
+ */
 package org.eclipse.papyrus.moka.ssp.profile.custom;
 
 import org.eclipse.papyrus.moka.ssp.profile.SSPProfilePackage;
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSSPProfileFactoryImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSSPProfileFactoryImpl.java
index c330403..7350b9b 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSSPProfileFactoryImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSSPProfileFactoryImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2018, Krisztián Mócsai, IncQuery Labs Ltd.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Krisztián Mócsai - initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectionImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectionImpl.java
index 32f6b1a..7ffa706 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectionImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectionImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2018, Krisztián Mócsai, IncQuery Labs Ltd.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Krisztián Mócsai - initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnector.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnector.java
index 51d31d3..45fd023 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnector.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnector.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2018, Krisztián Mócsai, IncQuery Labs Ltd.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Krisztián Mócsai - initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorAndFmiPortImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorAndFmiPortImpl.java
index 3e2b436..6971718 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorAndFmiPortImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorAndFmiPortImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2018, Krisztián Mócsai, IncQuery Labs Ltd.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Krisztián Mócsai - initial API and implementation
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorTypeImpl.java b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorTypeImpl.java
index d43c370..ffff5f8 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorTypeImpl.java
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.ssp.profile/src/org/eclipse/papyrus/moka/ssp/profile/custom/imp/CustomSsdConnectorTypeImpl.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2018, Krisztián Mócsai, IncQuery Labs Ltd.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *   Krisztián Mócsai - initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/about.html b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/about.html
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/Activator.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/Activator.java
index aa6e389..ae95959 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/Activator.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMI2UML.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMI2UML.java
index e4d4dbb..c8c6331 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMI2UML.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMI2UML.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMU2UMLTransformation.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMU2UMLTransformation.java
index 6b0ef35..c1c6506 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMU2UMLTransformation.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/src/org/eclipse/papyrus/moka/fmi/fmi2uml/FMU2UMLTransformation.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/about.html b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/about.html
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/src/org/eclipse/papyrus/moka/fmi/profile/ui/Activator.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/src/org/eclipse/papyrus/moka/fmi/profile/ui/Activator.java
index cc43685..6da5fd5 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/src/org/eclipse/papyrus/moka/fmi/profile/ui/Activator.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/src/org/eclipse/papyrus/moka/fmi/profile/ui/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/about.html b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
index b9f1158..dff841f 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
@@ -2,4 +2,5 @@
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               resources/
+               resources/,\
+               about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/about.html b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/about.html
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.genmodel b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.genmodel
index 5434116..f5ced86 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.genmodel
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/Fmi2ModelDescription.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) 2019 CEA LIST.&#xA;&#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; Contributors:&#xA; CEA LIST - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2019 CEA LIST.&#xA;&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License 2.0&#xA;which accompanies this distribution, and is available at&#xA;https://www.eclipse.org/legal/epl-2.0 &#xD;&#xA;&#xD;&#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA; CEA LIST - Initial API and implementation"
     modelDirectory="/org.eclipse.papyrus.moka.fmi/src-gen" modelPluginID="org.eclipse.papyrus.moka.fmi"
     modelName="fmi" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.xsd.ecore.importer" complianceLevel="6.0" copyrightFields="false"
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel
index 04c889d..7b9f3d8 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/model/fmumetamodel.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
-    copyrightText="Copyright (c) 2019 CEA LIST.&#xA;&#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; Contributors:&#xA; CEA LIST - Initial API and implementation"
+    copyrightText="Copyright (c) 2019 CEA LIST.&#xA;&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License 2.0&#xA;which accompanies this distribution, and is available at&#xA;https://www.eclipse.org/legal/epl-2.0 &#xD;&#xA;&#xD;&#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA; CEA LIST - Initial API and implementation"
     modelDirectory="/org.eclipse.papyrus.moka.fmi/src-gen" modelPluginID="org.eclipse.papyrus.moka.fmi"
     modelName="Fmumetamodel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/plugin.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/plugin.properties
index 05c4b64..4dcdcfb 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/plugin.properties
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/plugin.properties
@@ -3,9 +3,11 @@
 #  *
 #  *
 #  * All rights reserved. This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
+#  * are made available under the terms of the Eclipse Public License 2.0
 #  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
+#  * https://www.eclipse.org/legal/epl-2.0.html/
+#  *
+#  * SPDX-License-Identifier: EPL-2.0
 #  *
 #  * Contributors:
 #  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/AbstractFile.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/AbstractFile.java
index 294b1d9..1ee3872 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/AbstractFile.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/AbstractFile.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/ArchiveToUnzipInFMU.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/ArchiveToUnzipInFMU.java
index ddc3841..9416bdc 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/ArchiveToUnzipInFMU.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/ArchiveToUnzipInFMU.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FMUBundle.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FMUBundle.java
index 63ce7d6..b587990 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FMUBundle.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FMUBundle.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelFactory.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelFactory.java
index 1edce1c..91ea4e2 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelFactory.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelPackage.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelPackage.java
index f500a46..5c64c4a 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelPackage.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FmumetamodelPackage.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FolderToCreateInFMU.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FolderToCreateInFMU.java
index f408618..a836bec 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FolderToCreateInFMU.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/FolderToCreateInFMU.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/JavaFileProxy.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/JavaFileProxy.java
index 7459d6a..c3f518f 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/JavaFileProxy.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/JavaFileProxy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/AbstractFileImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/AbstractFileImpl.java
index 72b1eca..e506409 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/AbstractFileImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/AbstractFileImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/ArchiveToUnzipInFMUImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/ArchiveToUnzipInFMUImpl.java
index 6151b4b..f3b7cdf 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/ArchiveToUnzipInFMUImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/ArchiveToUnzipInFMUImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FMUBundleImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FMUBundleImpl.java
index be79a76..d8332e1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FMUBundleImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FMUBundleImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelFactoryImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelFactoryImpl.java
index 3d50f21..e6f9cc4 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelFactoryImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelFactoryImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelPackageImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelPackageImpl.java
index 76a26cf..10663bb 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelPackageImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FmumetamodelPackageImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FolderToCreateInFMUImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FolderToCreateInFMUImpl.java
index a8669df..c375861 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FolderToCreateInFMUImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/FolderToCreateInFMUImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/JavaFileProxyImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/JavaFileProxyImpl.java
index e0cff9f..f0b8622 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/JavaFileProxyImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/impl/JavaFileProxyImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelAdapterFactory.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelAdapterFactory.java
index 8b2bd55..26f3a0e 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelAdapterFactory.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelAdapterFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelSwitch.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelSwitch.java
index 518d8ad..2df2c0b 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelSwitch.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/fmumetamodel/util/FmumetamodelSwitch.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BaseUnitType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BaseUnitType.java
index 8780e3c..d2193b8 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BaseUnitType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BaseUnitType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BooleanType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BooleanType.java
index f93e649..ceb5042 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BooleanType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/BooleanType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CategoryType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CategoryType.java
index 2a70227..1c05d64 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CategoryType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CategoryType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CausalityType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CausalityType.java
index ac62734..498a555 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CausalityType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CausalityType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CoSimulationType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CoSimulationType.java
index 92bd587..cf2c5fb 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CoSimulationType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/CoSimulationType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DefaultExperimentType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DefaultExperimentType.java
index 740dae0..fd87fab 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DefaultExperimentType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DefaultExperimentType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem.java
index 89d3b35..d5fe123 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem1.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem1.java
index 4a3d0d0..8c67174 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem1.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DependenciesKindTypeItem1.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DisplayUnitType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DisplayUnitType.java
index e2f53d6..16aa693 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DisplayUnitType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DisplayUnitType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DocumentRoot.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DocumentRoot.java
index a606cf7..a0e12b1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DocumentRoot.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/DocumentRoot.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType.java
index 7089131..6d83647 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType1.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType1.java
index d5be47c..183b34e 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType1.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/EnumerationType1.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType.java
index 501e462..df2739d 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType1.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType1.java
index ba96443..5815584 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType1.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FileType1.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Annotation.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Annotation.java
index 2ae31a6..27d2e58 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Annotation.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Annotation.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2ScalarVariable.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2ScalarVariable.java
index 3728a9e..3705b52 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2ScalarVariable.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2ScalarVariable.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2SimpleType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2SimpleType.java
index 08e5043..da42c9d 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2SimpleType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2SimpleType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Unit.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Unit.java
index 5a314c4..d323bb1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Unit.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2Unit.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2VariableDependency.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2VariableDependency.java
index 59c10dc..ce4a6bf 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2VariableDependency.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/Fmi2VariableDependency.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiFactory.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiFactory.java
index 9e6afc3..bb0f5c7 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiFactory.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiModelDescriptionType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiModelDescriptionType.java
index 7a9cd80..e7f2578 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiModelDescriptionType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiModelDescriptionType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiPackage.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiPackage.java
index 31412b3..779fd62 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiPackage.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/FmiPackage.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialType.java
index 1d4b118..ca86595 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialUnknownsType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialUnknownsType.java
index 6e8fec2..a34e613 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialUnknownsType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/InitialUnknownsType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType.java
index 9651440..069f587 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType1.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType1.java
index f6dd470..3c53edd 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType1.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/IntegerType1.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ItemType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ItemType.java
index bf34fe6..e93760d 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ItemType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ItemType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/LogCategoriesType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/LogCategoriesType.java
index f6c3425..5a25d63 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/LogCategoriesType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/LogCategoriesType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelExchangeType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelExchangeType.java
index 38940cf..a8e832d 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelExchangeType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelExchangeType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelStructureType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelStructureType.java
index f71e8cf..c6e8850 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelStructureType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelStructureType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelVariablesType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelVariablesType.java
index e9cce8d..baa8a26 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelVariablesType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ModelVariablesType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType.java
index 28e780e..8e6685f 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType1.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType1.java
index 9580157..037cba4 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType1.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/RealType1.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType.java
index decae24..68d6116 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType1.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType1.java
index 3a05c6d..a7b965c 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType1.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/SourceFilesType1.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/StringType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/StringType.java
index 3c5c4f2..3110e31 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/StringType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/StringType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ToolType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ToolType.java
index 3728a25..ea8f11b 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ToolType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/ToolType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/TypeDefinitionsType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/TypeDefinitionsType.java
index 4121131..d65e707 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/TypeDefinitionsType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/TypeDefinitionsType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnitDefinitionsType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnitDefinitionsType.java
index b55ffab..2688b45 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnitDefinitionsType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnitDefinitionsType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType.java
index 912eaeb..aa98187 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType1.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType1.java
index c9970f4..ed42ac6 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType1.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/UnknownType1.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariabilityType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariabilityType.java
index 440f631..c428d3d 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariabilityType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariabilityType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariableNamingConventionType.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariableNamingConventionType.java
index 5dde30f..b9eeef1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariableNamingConventionType.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/VariableNamingConventionType.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BaseUnitTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BaseUnitTypeImpl.java
index 2832c59..e2cc2e2 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BaseUnitTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BaseUnitTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BooleanTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BooleanTypeImpl.java
index 619da95..f6a3f0c 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BooleanTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/BooleanTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CategoryTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CategoryTypeImpl.java
index 5e25c5f..d02ce50 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CategoryTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CategoryTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CoSimulationTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CoSimulationTypeImpl.java
index 6b86ebc..d9d93b6 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CoSimulationTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/CoSimulationTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DefaultExperimentTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DefaultExperimentTypeImpl.java
index 9570379..8f7493c 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DefaultExperimentTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DefaultExperimentTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DisplayUnitTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DisplayUnitTypeImpl.java
index cbbe8c4..064c97e 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DisplayUnitTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DisplayUnitTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DocumentRootImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DocumentRootImpl.java
index fbdb41e..b43f10a 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DocumentRootImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/DocumentRootImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationType1Impl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationType1Impl.java
index e30e1fb..40eb97b 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationType1Impl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationType1Impl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationTypeImpl.java
index 1200e5c..4fc5d47 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/EnumerationTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileType1Impl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileType1Impl.java
index e7e4a46..35d874b 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileType1Impl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileType1Impl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileTypeImpl.java
index 9fc3db7..bfb93e5 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FileTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2AnnotationImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2AnnotationImpl.java
index 38cf4dd..6a4eac5 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2AnnotationImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2AnnotationImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2ScalarVariableImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2ScalarVariableImpl.java
index c95a3f9..e676d5a 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2ScalarVariableImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2ScalarVariableImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2SimpleTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2SimpleTypeImpl.java
index 7ec171c..51a0e5a 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2SimpleTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2SimpleTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2UnitImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2UnitImpl.java
index 52321ed..0ef5491 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2UnitImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2UnitImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2VariableDependencyImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2VariableDependencyImpl.java
index 8087bfa..9532681 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2VariableDependencyImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/Fmi2VariableDependencyImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiFactoryImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiFactoryImpl.java
index c1e80b6..6bcdb27 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiFactoryImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiFactoryImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiModelDescriptionTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiModelDescriptionTypeImpl.java
index e7541b1..80750d6 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiModelDescriptionTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiModelDescriptionTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiPackageImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiPackageImpl.java
index 5df1d2c..878e682 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiPackageImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/FmiPackageImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/InitialUnknownsTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/InitialUnknownsTypeImpl.java
index 4c613a7..4e0b187 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/InitialUnknownsTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/InitialUnknownsTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerType1Impl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerType1Impl.java
index dc702c5..51d2ea7 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerType1Impl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerType1Impl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerTypeImpl.java
index 1549684..0497e51 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/IntegerTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ItemTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ItemTypeImpl.java
index 297391c..2bbc9e1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ItemTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ItemTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/LogCategoriesTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/LogCategoriesTypeImpl.java
index ace93e9..541f26c 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/LogCategoriesTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/LogCategoriesTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelExchangeTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelExchangeTypeImpl.java
index 270443a..9ac1162 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelExchangeTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelExchangeTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelStructureTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelStructureTypeImpl.java
index 076856e..0bedf9c 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelStructureTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelStructureTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelVariablesTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelVariablesTypeImpl.java
index 9913ad1..94634e8 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelVariablesTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ModelVariablesTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealType1Impl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealType1Impl.java
index c141196..77da374 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealType1Impl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealType1Impl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealTypeImpl.java
index 4efcaf7..8c0c0d3 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/RealTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesType1Impl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesType1Impl.java
index bbe67ad..f3281c8 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesType1Impl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesType1Impl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesTypeImpl.java
index c032add..d379172 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/SourceFilesTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/StringTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/StringTypeImpl.java
index b59d7e3..f88e17a 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/StringTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/StringTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ToolTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ToolTypeImpl.java
index 0a56eb1..8c5ff2f 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ToolTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/ToolTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/TypeDefinitionsTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/TypeDefinitionsTypeImpl.java
index 7863abd..4f7074e 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/TypeDefinitionsTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/TypeDefinitionsTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnitDefinitionsTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnitDefinitionsTypeImpl.java
index 158af2a..c980c47 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnitDefinitionsTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnitDefinitionsTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownType1Impl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownType1Impl.java
index 66c8046..271cbb8 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownType1Impl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownType1Impl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownTypeImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownTypeImpl.java
index eff11fc..cdf0848 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownTypeImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/impl/UnknownTypeImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiAdapterFactory.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiAdapterFactory.java
index 01d7e2a..3639d14 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiAdapterFactory.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiAdapterFactory.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceFactoryImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceFactoryImpl.java
index fb0ce02..a726161 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceFactoryImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceFactoryImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceImpl.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceImpl.java
index 56a9656..103c761 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceImpl.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiResourceImpl.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiSwitch.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiSwitch.java
index b4f7d7a..e35ece8 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiSwitch.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiSwitch.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiValidator.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiValidator.java
index 189c9ec..faae1a1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiValidator.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiValidator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiXMLProcessor.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiXMLProcessor.java
index 7f4ae7a..df06b56 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiXMLProcessor.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src-gen/org/eclipse/papyrus/moka/fmi/modeldescription/util/FmiXMLProcessor.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *  Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/Activator.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/Activator.java
index c69e39f..cdde4cf 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/Activator.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUParser.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUParser.java
index 2a53120..4e08089 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUParser.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUParser.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResource.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResource.java
index 4b7de7d..6df54d1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResource.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResource.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResourceFactory.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResourceFactory.java
index fe385e1..fd66850 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResourceFactory.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/fmu/FMUResourceFactory.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIOSDetector.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIOSDetector.java
index e05c4ed..c926567 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIOSDetector.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIOSDetector.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIUtil.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIUtil.java
index f16a51b..31485dd 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIUtil.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMIUtil.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMUResourceUtil.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMUResourceUtil.java
index a95d677..3253036 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMUResourceUtil.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/FMUResourceUtil.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/UnzipUtility.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/UnzipUtility.java
index 54bdfa3..8a703c1 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/UnzipUtility.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/src/org/eclipse/papyrus/moka/fmi/util/UnzipUtility.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/about.html b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/about.html
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/src/org/eclipse/papyrus/moka/fmu/rcp/FMURCPApplication.java b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/src/org/eclipse/papyrus/moka/fmu/rcp/FMURCPApplication.java
index a497af9..a08abdf 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/src/org/eclipse/papyrus/moka/fmu/rcp/FMURCPApplication.java
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/src/org/eclipse/papyrus/moka/fmu/rcp/FMURCPApplication.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/about.html b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/about.html
index d35d5ae..8d57930 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/about.html
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/Activator.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/Activator.java
index e2900e6..2f1c34e 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/Activator.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUAsPartCommand.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUAsPartCommand.java
index b2fa65e..e1219e2 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUAsPartCommand.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/commands/DropFMUAsPartCommand.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/AbstractFMIDialog.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/AbstractFMIDialog.java
index 3dcceae..e70483e 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/AbstractFMIDialog.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/AbstractFMIDialog.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ExportFMUDialog.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ExportFMUDialog.java
index 8ba1a98..09cf373 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ExportFMUDialog.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ExportFMUDialog.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ImportFMUDialog.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ImportFMUDialog.java
index e503aa5..8c950c2 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ImportFMUDialog.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dialogs/ImportFMUDialog.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dnd/FMUToPartDropStrategy.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dnd/FMUToPartDropStrategy.java
index 01b4b5d..897ad83 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dnd/FMUToPartDropStrategy.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/dnd/FMUToPartDropStrategy.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  *****************************************************************************/
 package org.eclipse.papyrus.moka.fmi.ui.dnd;
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/GroupPortsHanlder.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/GroupPortsHanlder.java
index 0ec57ce..b8dfd42 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/GroupPortsHanlder.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/GroupPortsHanlder.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/ImportFMULibHandler.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/ImportFMULibHandler.java
index 8d64ddb..03faee3 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/ImportFMULibHandler.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/handlers/ImportFMULibHandler.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2019 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
index b5df1d8..5480d7c 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/src/org/eclipse/papyrus/moka/fmi/ui/wizards/FMUTutoWizard.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Ansgar Radermacher  ansgar.radermacher@cea.fr
diff --git a/features/org.eclipse.papyrus.moka.feature/build.properties b/features/org.eclipse.papyrus.moka.feature/build.properties
index cffb917..b3a611b 100644
--- a/features/org.eclipse.papyrus.moka.feature/build.properties
+++ b/features/org.eclipse.papyrus.moka.feature/build.properties
@@ -1,6 +1,2 @@
 bin.includes = feature.xml,\
-               epl-v10.html,\
-               license.html,\
                feature.properties
-src.includes = epl-v10.html,\
-               license.html
\ No newline at end of file
diff --git a/features/org.eclipse.papyrus.moka.feature/epl-v10.html b/features/org.eclipse.papyrus.moka.feature/epl-v10.html
deleted file mode 100644
index cb1073a..0000000
--- a/features/org.eclipse.papyrus.moka.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.papyrus.moka.feature/feature.properties b/features/org.eclipse.papyrus.moka.feature/feature.properties
index 092c4ad..fe75cd0 100644
--- a/features/org.eclipse.papyrus.moka.feature/feature.properties
+++ b/features/org.eclipse.papyrus.moka.feature/feature.properties
@@ -1,143 +1,31 @@
 ###############################################################################
 # Copyright (c) 2013 CEA LIST.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     CEA LIST - initial API and implementation
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
 ###############################################################################
-featureName=Papyrus Moka Model Execution Tool (Incubation)
-providerName=Eclipse Modeling Project
 
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
+# "featureName" property - name of the feature
+featureName=Moka Core
 
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Modeling Project 
+
+# description property - text of the "Feature Description"
+description=\Core features for execution, animation and debugging of fUML\n\
+PSCS and PSSM conformant models
+################ end of description property ##################################
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2018 CEA LIST.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
 \n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
diff --git a/features/org.eclipse.papyrus.moka.feature/feature.xml b/features/org.eclipse.papyrus.moka.feature/feature.xml
index c9d560c..a8cde93 100644
--- a/features/org.eclipse.papyrus.moka.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.feature/feature.xml
@@ -1,27 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.papyrus.moka.feature"
-      label="Moka Core (Incubation)"
+      label="%featureName"
       version="4.0.0.qualifier"
-      provider-name="Eclipse Modeling Project">
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="2.0.0">
 
-   <description url="http://www.example.com/description">
-      MOKA is a framework for executing/simulating debugging fUML models. 
-      It implements:
-       1 - The execution semantics of Foundational UML
-       2 - The extension of the fUML semantics for Composite Structures
-      It provides the following possibilities:
-       1 - Execute models built from the UML subset considered by fUML (i.e. Classes, Actions, Activities, Composite Structures, Parts, Ports and Connectors)
-       2 - At runtime models are animated (i.e. current executed nodes are hilighted in a specific way)
-       3 - At runtime models can be debugged. According to breakpoints placed on a model, the execution engines stops and the UI provides variables snapshops which are presented to the user.
+   <description url="https://wiki.eclipse.org/Papyrus/UserGuide/ModelExecution">
+      Enable execution, animation and debugging of fUML/PSCS/PSSM conformant models
    </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2016 CEA LIST.
-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
+   
+   <copyright>
+      %copyright
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.papyrus.moka.feature/license.html b/features/org.eclipse.papyrus.moka.feature/license.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.papyrus.moka.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/build.properties b/features/org.eclipse.papyrus.moka.fmi.feature/build.properties
index 67be479..b3a611b 100644
--- a/features/org.eclipse.papyrus.moka.fmi.feature/build.properties
+++ b/features/org.eclipse.papyrus.moka.fmi.feature/build.properties
@@ -1,5 +1,2 @@
 bin.includes = feature.xml,\
-               epl-v10.html,\
-               license.html
-src.includes = epl-v10.html,\
-               license.html
+               feature.properties
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/epl-v10.html b/features/org.eclipse.papyrus.moka.fmi.feature/epl-v10.html
deleted file mode 100644
index cb1073a..0000000
--- a/features/org.eclipse.papyrus.moka.fmi.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties b/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties
new file mode 100644
index 0000000..ec90994
--- /dev/null
+++ b/features/org.eclipse.papyrus.moka.fmi.feature/feature.properties
@@ -0,0 +1,31 @@
+###############################################################################
+# Copyright (c) 2018 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+
+# "featureName" property - name of the feature
+featureName=Moka Core
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Modeling Project 
+
+# description property - text of the "Feature Description"
+description=FMI 2.0 based cosimulation in Papyrus
+################ end of description property ##################################
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2018 CEA LIST.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
+
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml b/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
index fef77bf..ebbe05d 100644
--- a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.papyrus.moka.fmi.feature"
-      label="Moka for Cosimulation (Incubation)"
+      label="%featureName"
       version="4.0.0.qualifier"
-      provider-name="Eclipse Modeling Project">
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="2.0.0">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description url="https://wiki.eclipse.org/Papyrus/UserGuide/ModelExecution">
+      Enable FMI 2.0 based cosimulation in Papyrus
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2016 CEA LIST.
-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
+   <copyright>
+      %copyright
    </copyright>
 
+   <license url="%licenseURL">
+      %license
+   </license>
+
    <requires>
       <import feature="org.eclipse.papyrus.moka.feature" version="4.0.0.qualifier"/>
 	  <import plugin="org.eclipse.core.runtime" version="3.14.0" match="compatible"/>
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/license.html b/features/org.eclipse.papyrus.moka.fmi.feature/license.html
deleted file mode 100644
index c3d34c3..0000000
--- a/features/org.eclipse.papyrus.moka.fmi.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/about.html b/products/org.eclipse.papyrus.moka.fmu.product/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/products/org.eclipse.papyrus.moka.fmu.product/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/build.properties b/products/org.eclipse.papyrus.moka.fmu.product/build.properties
index f44aa9d..080853b 100644
--- a/products/org.eclipse.papyrus.moka.fmu.product/build.properties
+++ b/products/org.eclipse.papyrus.moka.fmu.product/build.properties
@@ -1,3 +1,4 @@
 bin.includes = META-INF/,\
                .,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/about.html b/products/org.eclipse.papyrus.moka.standalone.product/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/products/org.eclipse.papyrus.moka.standalone.product/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/build.properties b/products/org.eclipse.papyrus.moka.standalone.product/build.properties
index 80e0e19..5098634 100644
--- a/products/org.eclipse.papyrus.moka.standalone.product/build.properties
+++ b/products/org.eclipse.papyrus.moka.standalone.product/build.properties
@@ -3,4 +3,5 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/src/org/eclipse/papyrus/moka/standalone/product/Activator.java b/products/org.eclipse.papyrus.moka.standalone.product/src/org/eclipse/papyrus/moka/standalone/product/Activator.java
index 0bc0736..4d44162 100644
--- a/products/org.eclipse.papyrus.moka.standalone.product/src/org/eclipse/papyrus/moka/standalone/product/Activator.java
+++ b/products/org.eclipse.papyrus.moka.standalone.product/src/org/eclipse/papyrus/moka/standalone/product/Activator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
diff --git a/releng/org.eclipse.papyrus.moka.configuration/pom.xml b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
index 41da667..bc37382 100644
--- a/releng/org.eclipse.papyrus.moka.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
@@ -113,6 +113,11 @@
 				<updatePolicy>daily</updatePolicy>
 			</snapshots>
 		</repository>
+		<repository>
+            <id>license-feature</id>
+            <url>http://download.eclipse.org/cbi/updates/license/</url>
+            <layout>p2</layout>
+        </repository>
 	</repositories>
 
 	<pluginRepositories>
@@ -137,4 +142,4 @@
 			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/org.eclipse.papyrus.moka.standalone.rcp/about.html b/releng/org.eclipse.papyrus.moka.standalone.rcp/about.html
new file mode 100644
index 0000000..997c5a2
--- /dev/null
+++ b/releng/org.eclipse.papyrus.moka.standalone.rcp/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/releng/org.eclipse.papyrus.moka.standalone.rcp/build.properties b/releng/org.eclipse.papyrus.moka.standalone.rcp/build.properties
index fe59bcc..968e1fe 100644
--- a/releng/org.eclipse.papyrus.moka.standalone.rcp/build.properties
+++ b/releng/org.eclipse.papyrus.moka.standalone.rcp/build.properties
@@ -3,4 +3,6 @@
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               pom.xml
+               pom.xml,\
+               about.html
+		
diff --git a/releng/org.eclipse.papyrus.moka.standalone.rcp/src/org/eclipse/papyrus/moka/standalone/rcp/Activator.java b/releng/org.eclipse.papyrus.moka.standalone.rcp/src/org/eclipse/papyrus/moka/standalone/rcp/Activator.java
index 8858774..e86316d 100644
--- a/releng/org.eclipse.papyrus.moka.standalone.rcp/src/org/eclipse/papyrus/moka/standalone/rcp/Activator.java
+++ b/releng/org.eclipse.papyrus.moka.standalone.rcp/src/org/eclipse/papyrus/moka/standalone/rcp/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/releng/org.eclipse.papyrus.moka.standalone.rcp/src/org/eclipse/papyrus/moka/standalone/rcp/MokaApplication.java b/releng/org.eclipse.papyrus.moka.standalone.rcp/src/org/eclipse/papyrus/moka/standalone/rcp/MokaApplication.java
index 61c17a2..e545b15 100644
--- a/releng/org.eclipse.papyrus.moka.standalone.rcp/src/org/eclipse/papyrus/moka/standalone/rcp/MokaApplication.java
+++ b/releng/org.eclipse.papyrus.moka.standalone.rcp/src/org/eclipse/papyrus/moka/standalone/rcp/MokaApplication.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/src/etc/header.epl.txt b/src/etc/header.epl.txt
index 68cbfa4..0cea001 100644
--- a/src/etc/header.epl.txt
+++ b/src/etc/header.epl.txt
@@ -1,4 +1,4 @@
 All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
+are made available under the terms of the Eclipse Public License 2
 which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
\ No newline at end of file
+https://www.eclipse.org/legal/epl-2.0/
diff --git a/src/site/resources/code/RequirementGenerator.java b/src/site/resources/code/RequirementGenerator.java
index bccad53..2f6ae02 100644
--- a/src/site/resources/code/RequirementGenerator.java
+++ b/src/site/resources/code/RequirementGenerator.java
@@ -3,9 +3,11 @@
  *
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Francois Le Fevre  francois.le-fevre@cea.fr - Initial API and implementation
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/about.html b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/about.html
new file mode 100644
index 0000000..3e183aa
--- /dev/null
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
index 820f673..892c766 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
@@ -3,4 +3,5 @@
 bin.includes = META-INF/,\
                .,\
                resources/,\
-               pom.xml
+               pom.xml,\
+               about.html
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java
index 8be4b31..d1e4d19 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java
index d1d4a6c..227743d 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/AllTests.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java
index 9da86d7..0899635 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/src/org/eclipse/papyrus/moka/fmi/test/TestFMI.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/tests/org.eclipse.payrus.moka.tests.framework/about.html b/tests/org.eclipse.payrus.moka.tests.framework/about.html
index dd3c089..3e183aa 100644
--- a/tests/org.eclipse.payrus.moka.tests.framework/about.html
+++ b/tests/org.eclipse.payrus.moka.tests.framework/about.html
@@ -8,13 +8,13 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>November 14, 2008</p>	
+<p>November 30, 2017</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/tests/org.eclipse.payrus.moka.tests.framework/src/org/eclipse/payrus/moka/tests/framework/Activator.java b/tests/org.eclipse.payrus.moka.tests.framework/src/org/eclipse/payrus/moka/tests/framework/Activator.java
index 3d8315e..40e20f6 100644
--- a/tests/org.eclipse.payrus.moka.tests.framework/src/org/eclipse/payrus/moka/tests/framework/Activator.java
+++ b/tests/org.eclipse.payrus.moka.tests.framework/src/org/eclipse/payrus/moka/tests/framework/Activator.java
@@ -3,9 +3,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/tests/org.eclipse.payrus.moka.tests.framework/src/org/eclipse/payrus/moka/tests/framework/semantics/AbstractSemanticTest.java b/tests/org.eclipse.payrus.moka.tests.framework/src/org/eclipse/payrus/moka/tests/framework/semantics/AbstractSemanticTest.java
index 82ad31a..21b752f 100644
--- a/tests/org.eclipse.payrus.moka.tests.framework/src/org/eclipse/payrus/moka/tests/framework/semantics/AbstractSemanticTest.java
+++ b/tests/org.eclipse.payrus.moka.tests.framework/src/org/eclipse/payrus/moka/tests/framework/semantics/AbstractSemanticTest.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/about.html b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/about.html
index dd3c089..1595e5d 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/about.html
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/AllTests.java b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/AllTests.java
index 1bd3d01..d387eb0 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/AllTests.java
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/AllTests.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  (CEA LIST) - Initial API and implementation
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/MokaSemanticTestsActivator.java b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/MokaSemanticTestsActivator.java
index 23e49ef..d3b0f95 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/MokaSemanticTestsActivator.java
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/MokaSemanticTestsActivator.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2014 CEA LIST.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  (CEA LIST) - Initial API and implementation
diff --git a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/composites/CompositeSemanticsTests.java b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/composites/CompositeSemanticsTests.java
index afa07ae..13cd9af 100644
--- a/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/composites/CompositeSemanticsTests.java
+++ b/tests/semantics/org.eclipse.papyrus.moka.semantics.tests/src/org/eclipse/papyrus/moka/semantics/tests/composites/CompositeSemanticsTests.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2016 CEA LIST.
  * 
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  CEA LIST Initial API and implementation