[535493] Migrate all files to EPL 2.0
diff --git a/doc/org.eclipse.ocl.doc/about.html b/doc/org.eclipse.ocl.doc/about.html
index c0be2e9..e9d1dac 100644
--- a/doc/org.eclipse.ocl.doc/about.html
+++ b/doc/org.eclipse.ocl.doc/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/doc/org.eclipse.ocl.doc/about.properties b/doc/org.eclipse.ocl.doc/about.properties
index e2271f3..f0f578b 100644
--- a/doc/org.eclipse.ocl.doc/about.properties
+++ b/doc/org.eclipse.ocl.doc/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/doc/org.eclipse.ocl.doc/build.properties b/doc/org.eclipse.ocl.doc/build.properties
index 6653d79..40c6ff5 100644
--- a/doc/org.eclipse.ocl.doc/build.properties
+++ b/doc/org.eclipse.ocl.doc/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/doc/org.eclipse.ocl.doc/build/antJavadoc.sh b/doc/org.eclipse.ocl.doc/build/antJavadoc.sh
index 6e1ce66..7bbc829 100644
--- a/doc/org.eclipse.ocl.doc/build/antJavadoc.sh
+++ b/doc/org.eclipse.ocl.doc/build/antJavadoc.sh
@@ -1,9 +1,9 @@
 #*******************************************************************************
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/doc/org.eclipse.ocl.doc/build/overview.html b/doc/org.eclipse.ocl.doc/build/overview.html
index 968f428..e612347 100644
--- a/doc/org.eclipse.ocl.doc/build/overview.html
+++ b/doc/org.eclipse.ocl.doc/build/overview.html
@@ -6,9 +6,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2008 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/doc/org.eclipse.ocl.doc/doc/3200-oclInterpreterExample.textile b/doc/org.eclipse.ocl.doc/doc/3200-oclInterpreterExample.textile
index 7129ad8..29ba3eb 100644
--- a/doc/org.eclipse.ocl.doc/doc/3200-oclInterpreterExample.textile
+++ b/doc/org.eclipse.ocl.doc/doc/3200-oclInterpreterExample.textile
@@ -54,5 +54,5 @@
 * parse, validate and evaluate OCL queries and constraints on EMF model elements
 * implement content-assist for OCL constraints in your model editor
 
-"Copyright (c) 2000, 2007 IBM Corporation and others. All Rights Reserved.":http://www.eclipse.org/legal/epl-v10.html
+"Copyright (c) 2000, 2007 IBM Corporation and others. All Rights Reserved.":http://www.eclipse.org/legal/epl-v20.html
 
diff --git a/doc/org.eclipse.ocl.doc/help/OCLInterpreterExample.html b/doc/org.eclipse.ocl.doc/help/OCLInterpreterExample.html
index 24c0d86..c0afcd4 100644
--- a/doc/org.eclipse.ocl.doc/help/OCLInterpreterExample.html
+++ b/doc/org.eclipse.ocl.doc/help/OCLInterpreterExample.html
@@ -185,7 +185,7 @@
 </div>

 <p>

 					

-<a class="ulink" href="http://www.eclipse.org/legal/epl-v10.html" target="_new">Copyright &copy; 2000, 2007 IBM Corporation and others. All Rights Reserved.</a>

+<a class="ulink" href="http://www.eclipse.org/legal/epl-v20.html" target="_new">Copyright &copy; 2000, 2007 IBM Corporation and others. All Rights Reserved.</a>

 				

 </p>

 </div>

diff --git a/doc/org.eclipse.ocl.doc/html/ocl.html b/doc/org.eclipse.ocl.doc/html/ocl.html
index 006657e..2531c3d 100644
--- a/doc/org.eclipse.ocl.doc/html/ocl.html
+++ b/doc/org.eclipse.ocl.doc/html/ocl.html
@@ -17324,7 +17324,7 @@
 </div>

 <p>

 					

-<a class="ulink" href="http://www.eclipse.org/legal/epl-v10.html" target="_new">Copyright &copy; 2000, 2007 IBM Corporation and others. All Rights Reserved.</a>

+<a class="ulink" href="http://www.eclipse.org/legal/epl-v20.html" target="_new">Copyright &copy; 2000, 2007 IBM Corporation and others. All Rights Reserved.</a>

 				

 </p>

 </div>

diff --git a/doc/org.eclipse.ocl.doc/javadoc/overview.html b/doc/org.eclipse.ocl.doc/javadoc/overview.html
index 34fc873..6ae4cd8 100644
--- a/doc/org.eclipse.ocl.doc/javadoc/overview.html
+++ b/doc/org.eclipse.ocl.doc/javadoc/overview.html
@@ -8,9 +8,9 @@
  *
  * Copyright (c) 2005, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/doc/org.eclipse.ocl.doc/plugin.properties b/doc/org.eclipse.ocl.doc/plugin.properties
index d2c848f..b852e61 100644
--- a/doc/org.eclipse.ocl.doc/plugin.properties
+++ b/doc/org.eclipse.ocl.doc/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/doc/org.eclipse.ocl.doc/plugin.xml b/doc/org.eclipse.ocl.doc/plugin.xml
index 1f3de99..7f57514 100644
--- a/doc/org.eclipse.ocl.doc/plugin.xml
+++ b/doc/org.eclipse.ocl.doc/plugin.xml
@@ -4,9 +4,9 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/doc/org.eclipse.ocl.doc/references/examples/exampleOverview.html b/doc/org.eclipse.ocl.doc/references/examples/exampleOverview.html
index ae064e2..e5cc814 100644
--- a/doc/org.eclipse.ocl.doc/references/examples/exampleOverview.html
+++ b/doc/org.eclipse.ocl.doc/references/examples/exampleOverview.html
@@ -30,7 +30,7 @@
 		<hr />
 
 		<p>
-			<a href="http://www.eclipse.org/legal/epl-v10.html">Copyright (c) 2000,2005 IBM Corporation and others. All Rights Reserved.</a>
+			<a href="http://www.eclipse.org/legal/epl-v20.html">Copyright (c) 2000,2005 IBM Corporation and others. All Rights Reserved.</a>
 		</p>
 	</body>
 </html>
diff --git a/examples/org.eclipse.ocl.examples.autogen/about.html b/examples/org.eclipse.ocl.examples.autogen/about.html
index 87b2a50..d87c26a 100644
--- a/examples/org.eclipse.ocl.examples.autogen/about.html
+++ b/examples/org.eclipse.ocl.examples.autogen/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.autogen/build.properties b/examples/org.eclipse.ocl.examples.autogen/build.properties
index 4565f58..4cafeb8 100644
--- a/examples/org.eclipse.ocl.examples.autogen/build.properties
+++ b/examples/org.eclipse.ocl.examples.autogen/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
@@ -12,9 +12,9 @@
 # 
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/plugin.properties b/examples/org.eclipse.ocl.examples.autogen/plugin.properties
index de605ff..714093a 100644
--- a/examples/org.eclipse.ocl.examples.autogen/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.autogen/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
@@ -12,9 +12,9 @@
 # 
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/AutoCodeGenOptions.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/AutoCodeGenOptions.java
index 1c5a2f2..242888e 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/AutoCodeGenOptions.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/AutoCodeGenOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCG2JavaPreVisitor.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCG2JavaPreVisitor.java
index 7cbd755..1c37927 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCG2JavaPreVisitor.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCG2JavaPreVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCG2JavaVisitor.java
index 977f43e..dced617 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCodeGenerator.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCodeGenerator.java
index a4439f2..8ea9718 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoGlobalContext.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoGlobalContext.java
index 2f05d70..701602f 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoGlobalContext.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoGlobalContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoLocalContext.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoLocalContext.java
index 00ae738..242f0f2 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoLocalContext.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoLocalContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoVisitorsCG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoVisitorsCG2JavaVisitor.java
index 43f830e..a80f41d 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoVisitorsCG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoVisitorsCG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoVisitorsCodeGenerator.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoVisitorsCodeGenerator.java
index 5335c27..8c9e9be 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoVisitorsCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/java/AutoVisitorsCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupCGUtil.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupCGUtil.java
index 1e77da8..e771ded 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupCGUtil.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupCGUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupCodeGenerator.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupCodeGenerator.java
index e1b1738..54d8a10 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupExportedCG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupExportedCG2JavaVisitor.java
index 2e14330..c075ecc 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupExportedCG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupExportedCG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupExportedVisitorCodeGenerator.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupExportedVisitorCodeGenerator.java
index 619dd17..5da1774 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupExportedVisitorCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupExportedVisitorCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterCG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterCG2JavaVisitor.java
index 4f9d403..744cfe1 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterCG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterCG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterClassContext.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterClassContext.java
index 91f82e2..d2f95fb 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterClassContext.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterClassContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterGenerator.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterGenerator.java
index 399c6f9..7c4da6a 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterGenerator.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupFilterGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupQualifiedCG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupQualifiedCG2JavaVisitor.java
index bef6900..6a4f7bd 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupQualifiedCG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupQualifiedCG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupQualifiedCodeGenerator.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupQualifiedCodeGenerator.java
index a0e443a..565a3d1 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupQualifiedCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupQualifiedCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupUnqualifiedCG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupUnqualifiedCG2JavaVisitor.java
index 4ea6d04..dbae40e 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupUnqualifiedCG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupUnqualifiedCG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupUnqualifiedCodeGenerator.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupUnqualifiedCodeGenerator.java
index 342e396..eb50d27 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupUnqualifiedCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupUnqualifiedCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsCG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsCG2JavaVisitor.java
index 3290779..0106e92 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsCG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsCG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsClassContext.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsClassContext.java
index 08b630f..dedf82f 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsClassContext.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsClassContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsCodeGenerator.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsCodeGenerator.java
index bfb5019..9fc7380 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/lookup/LookupVisitorsCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/utilities/GenPackageHelper.java b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/utilities/GenPackageHelper.java
index 5d1b9a0..032852c 100644
--- a/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/utilities/GenPackageHelper.java
+++ b/examples/org.eclipse.ocl.examples.autogen/src/org/eclipse/ocl/examples/autogen/utilities/GenPackageHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera
diff --git a/examples/org.eclipse.ocl.examples.build/about.html b/examples/org.eclipse.ocl.examples.build/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.build/about.html
+++ b/examples/org.eclipse.ocl.examples.build/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.build/build.properties b/examples/org.eclipse.ocl.examples.build/build.properties
index eb5f3b2..0bb53e2 100644
--- a/examples/org.eclipse.ocl.examples.build/build.properties
+++ b/examples/org.eclipse.ocl.examples.build/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/plugin.properties b/examples/org.eclipse.ocl.examples.build/plugin.properties
index 84f145f..2675c13 100644
--- a/examples/org.eclipse.ocl.examples.build/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.build/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAll.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAll.mwe2
index 7b95d42..6107837 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAll.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAll.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAllEditors.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAllEditors.mwe2
index 25868d8..f430110 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAllEditors.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAllEditors.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAnnotationModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAnnotationModel.mwe2
index 6a20230..b9c40c6 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAnnotationModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAnnotationModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAutoASModels.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAutoASModels.mwe2
index 2c68e06..f47d614 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAutoASModels.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAutoASModels.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAutoCSModels.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAutoCSModels.mwe2
index f4a0c26..39b7f5c 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAutoCSModels.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAutoCSModels.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateBaseEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateBaseEditor.mwe2
index 0bbfb0e..719ab97 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateBaseEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateBaseEditor.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -55,9 +55,9 @@
 "/*******************************************************************************
  * Copyright (c) 2011, \${year} Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCGLibraryModels.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCGLibraryModels.mwe2
index 17df245..7b364aa 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCGLibraryModels.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCGLibraryModels.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCGModels.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCGModels.mwe2
index ccdc84e..c09af98 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCGModels.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCGModels.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCSModels.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCSModels.mwe2
index 5787e01..52e5161 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCSModels.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCSModels.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCSModelsFromUML.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCSModelsFromUML.mwe2
index b407d79..e2cb24b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCSModelsFromUML.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCSModelsFromUML.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCompleteOCLEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCompleteOCLEditor.mwe2
index a16b38f..2fa769a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCompleteOCLEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCompleteOCLEditor.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -55,9 +55,9 @@
 "/*******************************************************************************
  * Copyright (c) 2011, \${year} Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateEssentialOCLEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateEssentialOCLEditor.mwe2
index dae6272..766fb2b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateEssentialOCLEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateEssentialOCLEditor.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -56,9 +56,9 @@
 "/*******************************************************************************
  * Copyright (c) 2011, \${year} Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateLookupModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateLookupModel.mwe2
index 51d60c9..5b71272 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateLookupModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateLookupModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateMarkupEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateMarkupEditor.mwe2
index e77ea23..b796505 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateMarkupEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateMarkupEditor.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -55,9 +55,9 @@
 "/*******************************************************************************
  * Copyright (c) 2011, \${year} Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLforUMLModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLforUMLModel.mwe2
index 2db9a5d..6c9ec97 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLforUMLModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLforUMLModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLinEcoreEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLinEcoreEditor.mwe2
index 7142607..f49c8fd 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLinEcoreEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLinEcoreEditor.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -57,9 +57,9 @@
 "/*******************************************************************************
  * Copyright (c) 2011, \${year} Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLmetamodel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLmetamodel.mwe2
index 4be875b..c954e84 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLmetamodel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLmetamodel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibEditor.mwe2
index f4c21d2..b4c3a2f 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibEditor.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -58,9 +58,9 @@
 "/*******************************************************************************
  * Copyright (c) 2011, \${year} Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibModel.mwe2
index 37ced34..81d31e3 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GeneratePivotModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GeneratePivotModel.mwe2
index e5ebf6f..f8fa915 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GeneratePivotModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GeneratePivotModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GeneratePivotTables.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GeneratePivotTables.mwe2
index 248b792..6c41a05 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GeneratePivotTables.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GeneratePivotTables.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateTestModels.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateTestModels.mwe2
index 5bff5a9..a541dae 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateTestModels.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateTestModels.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateUML25Model.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateUML25Model.mwe2
index 7e24d1f..f7dce7e 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateUML25Model.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateUML25Model.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/QuickGeneratePivotModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/QuickGeneratePivotModel.mwe2
index 82172d7..18fa260 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/QuickGeneratePivotModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/QuickGeneratePivotModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SaveUML.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SaveUML.mwe2
index cfba05a..481a33a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SaveUML.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SaveUML.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateASModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateASModel.mwe2
index 5adad89..60a6974 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateASModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateASModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateAutoASModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateAutoASModel.mwe2
index 7a34dd3..47708af 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateAutoASModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateAutoASModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateCSModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateCSModel.mwe2
index 6086ffe..73260ba 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateCSModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/SubGenerateCSModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/CompatibilityFragment.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/CompatibilityFragment.java
index 5e61f45..37ab0c1 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/CompatibilityFragment.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/CompatibilityFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/EssentialOCLFragment.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/EssentialOCLFragment.java
index 93fcc30..22b7727 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/EssentialOCLFragment.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/EssentialOCLFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/MarkupHoverFragment.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/MarkupHoverFragment.java
index 7289532..1ab15f3 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/MarkupHoverFragment.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/MarkupHoverFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenClassGeneratorAdapter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenClassGeneratorAdapter.java
index 4c7eb12..00249a2 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenClassGeneratorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenClassGeneratorAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenModelGeneratorAdapterFactory.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenModelGeneratorAdapterFactory.java
index 6d70dfb..88b9ad5 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenModelGeneratorAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenModelGeneratorAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenModelUtil.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenModelUtil.java
index 8dcff98..e211534 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenModelUtil.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenModelUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenPackageGeneratorAdapter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenPackageGeneratorAdapter.java
index 3c10e5f..474aa70 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenPackageGeneratorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildGenPackageGeneratorAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildUMLGenModelGeneratorAdapterFactory.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildUMLGenModelGeneratorAdapterFactory.java
index c7963e0..2c00756 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildUMLGenModelGeneratorAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildUMLGenModelGeneratorAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildUMLGenPackageGeneratorAdapter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildUMLGenPackageGeneratorAdapter.java
index 5426caf..1014943 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildUMLGenPackageGeneratorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/OCLBuildUMLGenPackageGeneratorAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenClassGeneratorAdapter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenClassGeneratorAdapter.java
index d3b35ba..c937d5a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenClassGeneratorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenClassGeneratorAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenEnumGeneratorAdapter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenEnumGeneratorAdapter.java
index 4c6c816..6d7aa50 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenEnumGeneratorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenEnumGeneratorAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenModelGeneratorAdapterFactory.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenModelGeneratorAdapterFactory.java
index 3fcff38..6207752 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenModelGeneratorAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/genmodel/SplitGenModelGeneratorAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateAllLaTeXs.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateAllLaTeXs.mwe2
index 4d97ea7..5ea7ad2 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateAllLaTeXs.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateAllLaTeXs.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeX.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeX.java
index 4e8b143..5929775 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeX.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeX.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModel.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModel.java
index 38952f5..1685cfe 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModel.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModel.mwe2
index 075cee9..fe2c01a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModelXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModelXtend.xtend
index 36f4092..7e1d786 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModelXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForASModelXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModel.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModel.java
index 84ef4d9..7a8afbc 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModel.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModel.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModel.mwe2
index 202ad19..4c16b03 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModel.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModel.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModelXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModelXtend.xtend
index 80e1f6a..bf8be79 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModelXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForCSModelXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammar.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammar.java
index b065410..610ea37 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammar.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammar.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammar.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammar.mwe2
index 912f592..5ad6809 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammar.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammar.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammarXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammarXtend.xtend
index 62c848b..4ea87c7 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammarXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForGrammarXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibrary.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibrary.java
index cca72d1..7de127e 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibrary.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibrary.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibrary.mwe2
index 5095021..bc4f867 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibrary.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibrary.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibraryXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibraryXtend.xtend
index d26aa46..97a3d44 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibraryXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXForLibraryXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXUtils.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXUtils.java
index b29dd28..79e0af1 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXUtils.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/latex/GenerateLaTeXUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGElementModelSpec.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGElementModelSpec.java
index 3508870..738e9b2 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGElementModelSpec.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGElementModelSpec.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGTypedElementModelSpec.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGTypedElementModelSpec.java
index 8d82787..c0769cf 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGTypedElementModelSpec.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGTypedElementModelSpec.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGValuedElementModelSpec.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGValuedElementModelSpec.java
index fb3974e..95cba0e 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGValuedElementModelSpec.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/CGValuedElementModelSpec.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/MethodSpec.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/MethodSpec.java
index d3524ae..623595a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/MethodSpec.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/MethodSpec.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/ModelSpec.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/ModelSpec.java
index 259da9d..e406590 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/ModelSpec.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/modelspecs/ModelSpec.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/BlackBoxLibrary.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/BlackBoxLibrary.java
index 6161792..a9c5a18 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/BlackBoxLibrary.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/BlackBoxLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/BlackBoxLibrary.qvto b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/BlackBoxLibrary.qvto
index 58ba644..b1b11e1 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/BlackBoxLibrary.qvto
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/BlackBoxLibrary.qvto
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/DerivedVisitorPatternTransf.qvto b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/DerivedVisitorPatternTransf.qvto
index b65ea7a..8c60b4a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/DerivedVisitorPatternTransf.qvto
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/DerivedVisitorPatternTransf.qvto
@@ -1,8 +1,8 @@
 // Copyright (c) 2013 Willink Transformations, University of York 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 v2.0
 // which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
+// http://www.eclipse.org/legal/epl-v20.html
 // 
 // Contributors:
 // 		Adolfo Sanchez-Barbudo Herrera (Univerisity of York) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/UML2EcoreMerger.qvto b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/UML2EcoreMerger.qvto
index a9278ec..7a6b925 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/UML2EcoreMerger.qvto
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/UML2EcoreMerger.qvto
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/VisitorPatternTransf.qvto b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/VisitorPatternTransf.qvto
index 457aa7c..788f937 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/VisitorPatternTransf.qvto
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/qvto/VisitorPatternTransf.qvto
@@ -1,8 +1,8 @@
 // Copyright (c) 2013 Willink Transformations, University of York 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 v2.0
 // which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
+// http://www.eclipse.org/legal/epl-v20.html
 // 
 // Contributors:
 // 		Adolfo Sanchez-Barbudo Herrera (Univerisity of York) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibrary.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibrary.java
index 383b11b..03af7ff 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibrary.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibrary.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibrary.mwe2
index 8ec7f18..42123e1 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibrary.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibrary.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibraryUtils.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibraryUtils.java
index 7342404..ca3d87f 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibraryUtils.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibraryUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibraryXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibraryXtend.xtend
index 8a83bd1..d6d942b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibraryXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForLibraryXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModel.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModel.java
index f3fd707..9f67dc4 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModel.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModelUtils.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModelUtils.java
index 227428b..9789ad5 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModelUtils.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModelUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModelXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModelXtend.xtend
index 81a062b..656e5c3 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModelXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/textile/GenerateTextileForModelXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/AbstractProjectComponent.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/AbstractProjectComponent.java
index e70c1a5..49e1572 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/AbstractProjectComponent.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/AbstractProjectComponent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/BackportToXtext_2_3_1.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/BackportToXtext_2_3_1.java
index b028d2a..b827e53 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/BackportToXtext_2_3_1.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/BackportToXtext_2_3_1.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CSSplitter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CSSplitter.java
index 4a781ae..3e843a5 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CSSplitter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CSSplitter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ClasspathURIHandler.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ClasspathURIHandler.java
index b74ae8b..a727031 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ClasspathURIHandler.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ClasspathURIHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CommentNormalizer.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CommentNormalizer.java
index 80b36b6..142ca20 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CommentNormalizer.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CommentNormalizer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CompleteOCLSeparator.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CompleteOCLSeparator.java
index 5bdc671..6d7874b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CompleteOCLSeparator.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CompleteOCLSeparator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CompleteOCLStandaloneSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CompleteOCLStandaloneSetup.java
index 9e04e3c..e208fe9 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CompleteOCLStandaloneSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CompleteOCLStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConstraintMerger.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConstraintMerger.java
index e32448e..c963a4c 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConstraintMerger.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConstraintMerger.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConstraintRemover.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConstraintRemover.java
index c691aaa..3b8cf5c 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConstraintRemover.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConstraintRemover.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConvertToUnixLineEndings.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConvertToUnixLineEndings.java
index dd62aa4..35e8440 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConvertToUnixLineEndings.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ConvertToUnixLineEndings.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CopyAndRename.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CopyAndRename.java
index 44883ec..226946b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CopyAndRename.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/CopyAndRename.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DerivedVisitorPatternWeaver.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DerivedVisitorPatternWeaver.java
index 87051d2..dcc5294 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DerivedVisitorPatternWeaver.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DerivedVisitorPatternWeaver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations ltd, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DynamicEPackageSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DynamicEPackageSetup.java
index cc7f797..69468c7 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DynamicEPackageSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/DynamicEPackageSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EConstraintRemover.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EConstraintRemover.java
index 8adeb13..6e69040 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EConstraintRemover.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EConstraintRemover.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EMF2MWEMonitorAdapter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EMF2MWEMonitorAdapter.java
index 5bb0120..2b43727 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EMF2MWEMonitorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EMF2MWEMonitorAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EPackageAlphabetizer.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EPackageAlphabetizer.java
index 1852877..25ec410 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EPackageAlphabetizer.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EPackageAlphabetizer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/Ecore2UMLConverter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/Ecore2UMLConverter.java
index af9c554..7cc9429 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/Ecore2UMLConverter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/Ecore2UMLConverter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreGenModelSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreGenModelSetup.java
index 5e09a36..2afc03a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreGenModelSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreGenModelSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreIdAssigner.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreIdAssigner.java
index 4789959..5398fff 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreIdAssigner.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreIdAssigner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreNormalizer.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreNormalizer.java
index 5f0669c..50f78f8 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreNormalizer.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EcoreNormalizer.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EssentialOCLStandaloneSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EssentialOCLStandaloneSetup.java
index a42d05b..46f5341 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EssentialOCLStandaloneSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/EssentialOCLStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenModelSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenModelSetup.java
index 7f3461c..e727375 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenModelSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenModelSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateCGedQVTiTransformation.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateCGedQVTiTransformation.java
index 18ddcc9..ac4342f 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateCGedQVTiTransformation.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateCGedQVTiTransformation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateModel.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateModel.java
index bc0333c..6cbabd5 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateModel.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenmodelReloader.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenmodelReloader.java
index b45f597..203a413 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenmodelReloader.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenmodelReloader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/IdAssigner.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/IdAssigner.java
index 97c2335..801709b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/IdAssigner.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/IdAssigner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/LoggerMonitor.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/LoggerMonitor.java
index 2466827..093500e 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/LoggerMonitor.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/LoggerMonitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/Model2tablesGenerator.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/Model2tablesGenerator.java
index b3c3f62..5d07dbe 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/Model2tablesGenerator.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/Model2tablesGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/NonAbstractTypeZapper.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/NonAbstractTypeZapper.java
index e37112d..2ae9d52 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/NonAbstractTypeZapper.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/NonAbstractTypeZapper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLDelegateActivator.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLDelegateActivator.java
index b16506e..c3cf045 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLDelegateActivator.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLDelegateActivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLDelegateSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLDelegateSetup.java
index 85695b2..a8fce7f 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLDelegateSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLDelegateSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLStandaloneSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLStandaloneSetup.java
index 603de12..f9c9189 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLStandaloneSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/OCLStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PackageAlphabetizer.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PackageAlphabetizer.java
index 4e77fa3..fb88bb3 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PackageAlphabetizer.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PackageAlphabetizer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PackageMerger.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PackageMerger.java
index 26c530d..82ed256 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PackageMerger.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PackageMerger.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PredefinedQVToTransformationExecutor.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PredefinedQVToTransformationExecutor.java
index 3524593..f81938b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PredefinedQVToTransformationExecutor.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PredefinedQVToTransformationExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ProjectMapSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ProjectMapSetup.java
index 7594b26..666984a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ProjectMapSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ProjectMapSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PruneSuperClasses.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PruneSuperClasses.java
index 872f4a4..e4066cb 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PruneSuperClasses.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/PruneSuperClasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/QVToTransformationExecutor.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/QVToTransformationExecutor.java
index 68256b3..de490e5 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/QVToTransformationExecutor.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/QVToTransformationExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceReader.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceReader.java
index d58485c..0e62e7c 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceReader.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceReader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceRenamer.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceRenamer.java
index ae7b981..4733e2e 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceRenamer.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceRenamer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceUtils.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceUtils.java
index a89266c..5770aef 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceUtils.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceWriter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceWriter.java
index ef9bbf5..4bbebcb 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceWriter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/ResourceWriter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/RunLPG.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/RunLPG.java
index 2b72ebc..105a467 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/RunLPG.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/RunLPG.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SetASmetamodel.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SetASmetamodel.java
index 6a4f618..cac2c7a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SetASmetamodel.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SetASmetamodel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SetNsURI.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SetNsURI.java
index aad5bb0..68c0d3b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SetNsURI.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SetNsURI.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SplitGenModelSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SplitGenModelSetup.java
index 2015d57..19714fb 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SplitGenModelSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/SplitGenModelSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/StructuralENamedElementIdAssigner.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/StructuralENamedElementIdAssigner.java
index 87a5109..a1b10f3 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/StructuralENamedElementIdAssigner.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/StructuralENamedElementIdAssigner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/TextilePrettyPrinter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/TextilePrettyPrinter.java
index 924f165..45021f2 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/TextilePrettyPrinter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/TextilePrettyPrinter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25Fixes.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25Fixes.java
index e75b3e7..51c4585 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25Fixes.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25Fixes.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25GenModelSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25GenModelSetup.java
index a395402..8c887e0 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25GenModelSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25GenModelSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML2ASLoader.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML2ASLoader.java
index 4779e39..748931a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML2ASLoader.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML2ASLoader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLAssociationNormalizer.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLAssociationNormalizer.java
index 80c750c..a4a9868 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLAssociationNormalizer.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLAssociationNormalizer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLGenModelSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLGenModelSetup.java
index 2c336c1..b3f7980 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLGenModelSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLGenModelSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLIDAssigner.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLIDAssigner.java
index d4bc8ed..e4f6278 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLIDAssigner.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLIDAssigner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLStandaloneSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLStandaloneSetup.java
index ce3aecd..da51332 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLStandaloneSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UMLStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/VisitorPatternWeaver.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/VisitorPatternWeaver.java
index bb005b4..719f15b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/VisitorPatternWeaver.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/VisitorPatternWeaver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations ltd, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/XMI2UMLResourceReader.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/XMI2UMLResourceReader.java
index cf40fd5..a241e99 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/XMI2UMLResourceReader.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/XMI2UMLResourceReader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/XtextStandaloneSetupBean.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/XtextStandaloneSetupBean.java
index 1b3ad58..26e068c 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/XtextStandaloneSetupBean.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/XtextStandaloneSetupBean.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateASVisitors.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateASVisitors.xtend
index 6fee38f..defe0bb 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateASVisitors.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateASVisitors.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateAutoCS2ASVisitors.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateAutoCS2ASVisitors.java
index dfdf2e3..a872c4a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateAutoCS2ASVisitors.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateAutoCS2ASVisitors.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateAutoLookupInfrastructureXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateAutoLookupInfrastructureXtend.xtend
index 728675e..aafc9bb 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateAutoLookupInfrastructureXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateAutoLookupInfrastructureXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCGVisitors.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCGVisitors.xtend
index 09219ba..d548745 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCGVisitors.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCGVisitors.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCS2ASVisitors.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCS2ASVisitors.xtend
index 0d6af20..e8d772c 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCS2ASVisitors.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCS2ASVisitors.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCSVisitors.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCSVisitors.xtend
index a9f109c..31b50b2 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCSVisitors.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateCSVisitors.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateGrammar.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateGrammar.java
index 5e6a9f6..abe9f01 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateGrammar.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateGrammar.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateGrammarXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateGrammarXtend.xtend
index 31e54ee..b506b84 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateGrammarXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateGrammarXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -58,9 +58,9 @@
 			/*******************************************************************************
 			 * Copyright (c) 2015, «year» Willink Transformations 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 v2.0
 			 * which accompanies this distribution, and is available at
-			 * http://www.eclipse.org/legal/epl-v10.html
+			 * http://www.eclipse.org/legal/epl-v20.html
 			 *
 			 * Contributors:
 			 *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateMetamodelWorkflowComponent.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateMetamodelWorkflowComponent.java
index a0b62f2..e69266d 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateMetamodelWorkflowComponent.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateMetamodelWorkflowComponent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLCommon.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLCommon.java
index a6e3a7f..51f3202 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLCommon.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLCommon.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLCommonXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLCommonXtend.xtend
index a8df1af..e9eaa0f 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLCommonXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLCommonXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodel.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodel.java
index 9f1974b..310eb07 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodel.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodelXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodelXtend.xtend
index 6d4f3c0..92f1cf3 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodelXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLmetamodelXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -69,9 +69,9 @@
 			/*******************************************************************************
 			 * Copyright (c) 2010, «year» Willink Transformations 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 v2.0
 			 * which accompanies this distribution, and is available at
-			 * http://www.eclipse.org/legal/epl-v10.html
+			 * http://www.eclipse.org/legal/epl-v20.html
 			 *
 			 * Contributors:
 			 *   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlib.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlib.java
index a7c58fe..c49ab4d 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlib.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlib.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlibXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlibXtend.xtend
index 53767f1..60627d8 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlibXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateOCLstdlibXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
@@ -58,9 +58,9 @@
 			/*******************************************************************************
 			 * Copyright (c) 2010, «year» Willink Transformations 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 v2.0
 			 * which accompanies this distribution, and is available at
-			 * http://www.eclipse.org/legal/epl-v10.html
+			 * http://www.eclipse.org/legal/epl-v20.html
 			 *
 			 * Contributors:
 			 *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitors.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitors.java
index f7fbba9..62dd8e1 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitors.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitors.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitorsWorkflowComponent.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitorsWorkflowComponent.java
index 10d3b73..28acab3 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitorsWorkflowComponent.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitorsWorkflowComponent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitorsXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitorsXtend.xtend
index 01e12fa..b578271 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitorsXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/GenerateVisitorsXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/MergeWriter.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/MergeWriter.java
index 9bc13d1..23da9c0 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/MergeWriter.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/MergeWriter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/MergeWriterTest.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/MergeWriterTest.java
index 7333c48..21ff20a 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/MergeWriterTest.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/MergeWriterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/NameQueries.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/NameQueries.java
index 3c5722c..fff621e 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/NameQueries.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/xtend/NameQueries.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/templates/model/AdapterFactoryClass.javajet b/examples/org.eclipse.ocl.examples.build/templates/model/AdapterFactoryClass.javajet
index 43b94bb..bccb68f 100644
--- a/examples/org.eclipse.ocl.examples.build/templates/model/AdapterFactoryClass.javajet
+++ b/examples/org.eclipse.ocl.examples.build/templates/model/AdapterFactoryClass.javajet
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2006 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/templates/model/PackageClass.javajet b/examples/org.eclipse.ocl.examples.build/templates/model/PackageClass.javajet
index 06f2c7a..38c19ab 100644
--- a/examples/org.eclipse.ocl.examples.build/templates/model/PackageClass.javajet
+++ b/examples/org.eclipse.ocl.examples.build/templates/model/PackageClass.javajet
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.build/templates/model/SwitchClass.javajet b/examples/org.eclipse.ocl.examples.build/templates/model/SwitchClass.javajet
index 112b285..a879db5 100644
--- a/examples/org.eclipse.ocl.examples.build/templates/model/SwitchClass.javajet
+++ b/examples/org.eclipse.ocl.examples.build/templates/model/SwitchClass.javajet
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2006 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.classic/about.html b/examples/org.eclipse.ocl.examples.classic/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.classic/about.html
+++ b/examples/org.eclipse.ocl.examples.classic/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.classic/about.properties b/examples/org.eclipse.ocl.examples.classic/about.properties
index 7d0669f..45dac1b 100644
--- a/examples/org.eclipse.ocl.examples.classic/about.properties
+++ b/examples/org.eclipse.ocl.examples.classic/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.classic/build.properties b/examples/org.eclipse.ocl.examples.classic/build.properties
index 20ea58a..1603ab6 100644
--- a/examples/org.eclipse.ocl.examples.classic/build.properties
+++ b/examples/org.eclipse.ocl.examples.classic/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.classic/plugin.properties b/examples/org.eclipse.ocl.examples.classic/plugin.properties
index f3463aa..3b2ddb0 100644
--- a/examples/org.eclipse.ocl.examples.classic/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.classic/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/about.html b/examples/org.eclipse.ocl.examples.codegen/about.html
index 8d72b76..f366e1a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/about.html
+++ b/examples/org.eclipse.ocl.examples.codegen/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.codegen/build.properties b/examples/org.eclipse.ocl.examples.codegen/build.properties
index cf1d50a..720c12c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/build.properties
+++ b/examples/org.eclipse.ocl.examples.codegen/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGAccumulator.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGAccumulator.java
index b973955..bb43f9a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGAccumulator.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGAccumulator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGAssertNonNullExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGAssertNonNullExp.java
index 83da88a..0ea7fa5 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGAssertNonNullExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGAssertNonNullExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBoolean.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBoolean.java
index 024bf16..4ba4ef9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBoolean.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBoolean.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBoxExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBoxExp.java
index 2c802f7..6eccd56 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBoxExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBoxExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBuiltInIterationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBuiltInIterationCallExp.java
index 803c8f3..ec63030 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBuiltInIterationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGBuiltInIterationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCachedOperation.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCachedOperation.java
index 9f4b2ce..ce1fa60 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCachedOperation.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCachedOperation.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCachedOperationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCachedOperationCallExp.java
index ad0c6ae..22ad927 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCachedOperationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCachedOperationCallExp.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCallExp.java
index 165c294..203fd93 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCallable.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCallable.java
index d6ba2ed..b903457 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCallable.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCallable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCastExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCastExp.java
index 9321775..a6fb4cb 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCastExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCastExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCatchExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCatchExp.java
index b5d3c28..5ca5e9a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCatchExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCatchExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGClass.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGClass.java
index 4438dcc..2119456 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGClass.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGClass.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCollectionExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCollectionExp.java
index 1c01a55..a86183c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCollectionExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCollectionExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCollectionPart.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCollectionPart.java
index a18387f..aab9e0c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCollectionPart.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGCollectionPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstant.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstant.java
index 5f27ec2..f07822a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstant.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstant.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstantExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstantExp.java
index b725587..b159faf 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstantExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstantExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstraint.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstraint.java
index d010541..d520a13 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstraint.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGConstraint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreClassShadowExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreClassShadowExp.java
index a433b57..7736501 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreClassShadowExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreClassShadowExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreDataTypeShadowExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreDataTypeShadowExp.java
index 8624297..0147d42 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreDataTypeShadowExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreDataTypeShadowExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreExp.java
index 1ffa9cd..08cac7e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreExp.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOperation.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOperation.java
index 0b5eae2..9d1e881 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOperation.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOperationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOperationCallExp.java
index 0828595..dc3d08a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOperationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOppositePropertyCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOppositePropertyCallExp.java
index 61eec83..67cfe9f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOppositePropertyCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcoreOppositePropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcorePropertyCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcorePropertyCallExp.java
index 06e2b29..3d0639d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcorePropertyCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGEcorePropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGElement.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGElement.java
index b536c0f..91d33c5 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGElement.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGElementId.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGElementId.java
index f490130..7aaaa37 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGElementId.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGElementId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorCompositionProperty.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorCompositionProperty.java
index 4cb0052..71a886c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorCompositionProperty.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorCompositionProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorNavigationProperty.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorNavigationProperty.java
index 732c72d..3fd4244 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorNavigationProperty.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorNavigationProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOperation.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOperation.java
index c7ab615..838396e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOperation.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOperationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOperationCallExp.java
index e80bedf..0bc8a27 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOperationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOppositeProperty.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOppositeProperty.java
index 40779ec..141f1fa 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOppositeProperty.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOppositeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOppositePropertyCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOppositePropertyCallExp.java
index 589d763..6e30373 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOppositePropertyCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorOppositePropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorProperty.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorProperty.java
index 9e06317..00d2f56 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorProperty.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorPropertyCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorPropertyCallExp.java
index a096c98..b8a556d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorPropertyCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorPropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorShadowPart.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorShadowPart.java
index 79a1a20..a56b5a3 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorShadowPart.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorShadowPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorType.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorType.java
index 320f4a5..cf516e2 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorType.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGExecutorType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGFinalVariable.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGFinalVariable.java
index 7b41bbf..cca2a34 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGFinalVariable.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGFinalVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGGuardExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGGuardExp.java
index 6e3297b..ad59b5e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGGuardExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGGuardExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIfExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIfExp.java
index e907b88..30759bb 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIfExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIfExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGInteger.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGInteger.java
index 9cc0b6e..f8a35fd 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGInteger.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGInteger.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGInvalid.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGInvalid.java
index f51a88b..ab1b1d6 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGInvalid.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGInvalid.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsEqual2Exp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsEqual2Exp.java
index 4979c77..bde6800 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsEqual2Exp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsEqual2Exp.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsEqualExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsEqualExp.java
index ade81e9..0472246 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsEqualExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsEqualExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsInvalidExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsInvalidExp.java
index 0f2bc34..6cabaef 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsInvalidExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsInvalidExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsKindOfExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsKindOfExp.java
index dced809..c089a67 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsKindOfExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsKindOfExp.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsUndefinedExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsUndefinedExp.java
index 6d52174..0a6f882 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsUndefinedExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIsUndefinedExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIterationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIterationCallExp.java
index 36dd99b..374000c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIterationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIterationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIterator.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIterator.java
index c471f13..bc6ad99 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIterator.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGIterator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLetExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLetExp.java
index 3e7b60e..d5f8267 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLetExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLetExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryIterateCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryIterateCallExp.java
index 3b10021..c97b12d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryIterateCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryIterateCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryIterationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryIterationCallExp.java
index 6852bf8..811bd07 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryIterationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryIterationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryOperation.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryOperation.java
index b0692f7..0623dd6 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryOperation.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryOperationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryOperationCallExp.java
index 39223b7..82c2d84 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryOperationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryOperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryPropertyCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryPropertyCallExp.java
index dd7d867..479a796 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryPropertyCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLibraryPropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLocalVariable.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLocalVariable.java
index 48e75e5..442bd55 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLocalVariable.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGLocalVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGMapExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGMapExp.java
index a661c7a..6ff4431 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGMapExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGMapExp.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGMapPart.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGMapPart.java
index a1ce905..e609a4b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGMapPart.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGMapPart.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModel.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModel.java
index 820bf19..c015f02 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModel.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModelFactory.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModelFactory.java
index 71178b5..3f86385 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModelFactory.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModelFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModelPackage.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModelPackage.java
index 80184ba..de4ad15 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModelPackage.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGModelPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNamedElement.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNamedElement.java
index 04830ad..b36169a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNamedElement.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNamedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeOperation.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeOperation.java
index b61a3c7..161443a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeOperation.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeOperationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeOperationCallExp.java
index 70eeeca..edc0775 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeOperationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeOperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeProperty.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeProperty.java
index 0488f39..1612fe6 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeProperty.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativePropertyCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativePropertyCallExp.java
index e25f8bd..9e1fda0 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativePropertyCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNativePropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNavigationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNavigationCallExp.java
index 74cec75..dc0eb71 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNavigationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNavigationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNull.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNull.java
index 0e6e27b..119e5c5 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNull.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNull.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNumber.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNumber.java
index c27138f..d9ffcc0 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNumber.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGNumber.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOperation.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOperation.java
index 40d0e8c..cd6b17f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOperation.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOperationCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOperationCallExp.java
index 831d5e6..b68ac04 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOperationCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOppositePropertyCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOppositePropertyCallExp.java
index 59ec77f..0d7ee83 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOppositePropertyCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGOppositePropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGPackage.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGPackage.java
index 51b941a..bce5f14 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGPackage.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGParameter.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGParameter.java
index 0204b88..7235016 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGParameter.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGParameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGProperty.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGProperty.java
index 912a0e2..db75a98 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGProperty.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGPropertyCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGPropertyCallExp.java
index 3918ce9..09a007f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGPropertyCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGPropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGReal.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGReal.java
index e56c29f..e8250ec 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGReal.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGReal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGSettableVariable.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGSettableVariable.java
index 3ec522f..d48770b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGSettableVariable.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGSettableVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGShadowExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGShadowExp.java
index f31f226..9b5e1ef 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGShadowExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGShadowExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGShadowPart.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGShadowPart.java
index 1662c09..029d9fc 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGShadowPart.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGShadowPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGString.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGString.java
index 38169c4..d2ac880 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGString.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGString.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGText.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGText.java
index d39de9b..5d42875 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGText.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGText.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGThrowExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGThrowExp.java
index ab713f1..6fe0e41 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGThrowExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGThrowExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTupleExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTupleExp.java
index aa940f7..49e1929 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTupleExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTupleExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTuplePart.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTuplePart.java
index df83219..52d8472 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTuplePart.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTuplePart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTuplePartCallExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTuplePartCallExp.java
index 36bfbe3..53a1f54 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTuplePartCallExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTuplePartCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypeExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypeExp.java
index 2b12375..52b9e9a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypeExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypeExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypeId.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypeId.java
index f2b7112..59ac928 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypeId.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypedElement.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypedElement.java
index c96000e..f28eaa2 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypedElement.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGTypedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGUnboxExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGUnboxExp.java
index 8bb8fd8..779c49f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGUnboxExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGUnboxExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGUnlimited.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGUnlimited.java
index 1dd32ab..dc0a58b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGUnlimited.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGUnlimited.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGValuedElement.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGValuedElement.java
index b54ba64..0ab72f5 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGValuedElement.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGValuedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGVariable.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGVariable.java
index 6d06d74..5fad72a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGVariable.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGVariableExp.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGVariableExp.java
index 50cc244..a18a980 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGVariableExp.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/CGVariableExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAccumulatorImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAccumulatorImpl.java
index a76bb65..b499a7f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAccumulatorImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAccumulatorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAssertNonNullExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAssertNonNullExpImpl.java
index a5aedb7..0be2d5c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAssertNonNullExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGAssertNonNullExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBooleanImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBooleanImpl.java
index fbb8931..49c3b1b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBooleanImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBooleanImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBoxExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBoxExpImpl.java
index 7f4662f..8ff20ed 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBoxExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBoxExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBuiltInIterationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBuiltInIterationCallExpImpl.java
index 5063b54..a861ad0 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBuiltInIterationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGBuiltInIterationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCachedOperationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCachedOperationCallExpImpl.java
index f189f52..489fa8c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCachedOperationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCachedOperationCallExpImpl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCachedOperationImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCachedOperationImpl.java
index 031f19d..7b8172f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCachedOperationImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCachedOperationImpl.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCallExpImpl.java
index 92a2827..702e88a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCallableImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCallableImpl.java
index 76d9c22..e519c5d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCallableImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCallableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCastExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCastExpImpl.java
index 960d71d..0fc9325 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCastExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCastExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCatchExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCatchExpImpl.java
index 269f9f1..4fd822e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCatchExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCatchExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGClassImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGClassImpl.java
index 7aea840..1d585f9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGClassImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGClassImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCollectionExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCollectionExpImpl.java
index 635e33f..da73972 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCollectionExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCollectionExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCollectionPartImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCollectionPartImpl.java
index d5bb698..ea5642a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCollectionPartImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGCollectionPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstantExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstantExpImpl.java
index 4833fa8..5192be2 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstantExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstantExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstantImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstantImpl.java
index df9d286..541f2c9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstantImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstantImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstraintImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstraintImpl.java
index d7b4eb6..d641583 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstraintImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGConstraintImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreClassShadowExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreClassShadowExpImpl.java
index 6f3af5f..fabe498 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreClassShadowExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreClassShadowExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreDataTypeShadowExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreDataTypeShadowExpImpl.java
index 2c217ee..926c8f3 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreDataTypeShadowExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreDataTypeShadowExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreExpImpl.java
index f2b5d8f..6103315 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreExpImpl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOperationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOperationCallExpImpl.java
index 4078b09..bb00307 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOperationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOperationImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOperationImpl.java
index c13ccd3..487a4fc 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOperationImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOperationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOppositePropertyCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOppositePropertyCallExpImpl.java
index 4515311..e45ed9d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOppositePropertyCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcoreOppositePropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcorePropertyCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcorePropertyCallExpImpl.java
index 9dde327..5bc3829 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcorePropertyCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGEcorePropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGElementIdImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGElementIdImpl.java
index 20a4c74..4ef8a01 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGElementIdImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGElementIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGElementImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGElementImpl.java
index 5190556..007076a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGElementImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorCompositionPropertyImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorCompositionPropertyImpl.java
index 88246cf..d2b6265 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorCompositionPropertyImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorCompositionPropertyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorNavigationPropertyImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorNavigationPropertyImpl.java
index c07b6ed..c29c0af 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorNavigationPropertyImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorNavigationPropertyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOperationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOperationCallExpImpl.java
index 5444105..8ab9346 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOperationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOperationImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOperationImpl.java
index aa2b442..9546e9a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOperationImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOperationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOppositePropertyCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOppositePropertyCallExpImpl.java
index 700e166..9fa6fca 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOppositePropertyCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOppositePropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOppositePropertyImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOppositePropertyImpl.java
index 89f7368..8f2941e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOppositePropertyImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorOppositePropertyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorPropertyCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorPropertyCallExpImpl.java
index 97326e9..1e1b0da 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorPropertyCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorPropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorPropertyImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorPropertyImpl.java
index 6d948c6..f8893c5 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorPropertyImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorPropertyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorShadowPartImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorShadowPartImpl.java
index 4c33475..99563a0 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorShadowPartImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorShadowPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorTypeImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorTypeImpl.java
index c04ff9c..932bc5f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorTypeImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGExecutorTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGFinalVariableImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGFinalVariableImpl.java
index e9b1324..2b161e8 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGFinalVariableImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGFinalVariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGGuardExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGGuardExpImpl.java
index 92fc564..e9a1579 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGGuardExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGGuardExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIfExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIfExpImpl.java
index b688120..6f804cb 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIfExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIfExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIntegerImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIntegerImpl.java
index 8fe05be..f95bd65 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIntegerImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIntegerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGInvalidImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGInvalidImpl.java
index 66b2e55..9b00f31 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGInvalidImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGInvalidImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsEqual2ExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsEqual2ExpImpl.java
index ab6d61b..f38044b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsEqual2ExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsEqual2ExpImpl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsEqualExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsEqualExpImpl.java
index 88f70cf..19d3d84 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsEqualExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsEqualExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsInvalidExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsInvalidExpImpl.java
index 624dd5c..c29eebe 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsInvalidExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsInvalidExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsKindOfExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsKindOfExpImpl.java
index 1a8bc88..5a02ab7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsKindOfExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsKindOfExpImpl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsUndefinedExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsUndefinedExpImpl.java
index 5ba0e89..5cc97be 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsUndefinedExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIsUndefinedExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIterationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIterationCallExpImpl.java
index 4802d82..fb6cea1 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIterationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIterationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIteratorImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIteratorImpl.java
index 8592972..449be0d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIteratorImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGIteratorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLetExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLetExpImpl.java
index 7bfe800..bd30549 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLetExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLetExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryIterateCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryIterateCallExpImpl.java
index e518153..b28fdaa 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryIterateCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryIterateCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryIterationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryIterationCallExpImpl.java
index eb96b65..66b1f22 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryIterationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryIterationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryOperationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryOperationCallExpImpl.java
index 85c8ea3..f8249b7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryOperationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryOperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryOperationImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryOperationImpl.java
index d6c5d95..d56a302 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryOperationImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryOperationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryPropertyCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryPropertyCallExpImpl.java
index f4ab495..98960ec 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryPropertyCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLibraryPropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLocalVariableImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLocalVariableImpl.java
index 34bc7ae..765816b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLocalVariableImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGLocalVariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGMapExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGMapExpImpl.java
index 09fc5d1..60923f4 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGMapExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGMapExpImpl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGMapPartImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGMapPartImpl.java
index f352087..333ebb7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGMapPartImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGMapPartImpl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelFactoryImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelFactoryImpl.java
index 0d5b2bb..5f25840 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelFactoryImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelImpl.java
index d5a5ae5..41924db 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelPackageImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelPackageImpl.java
index 2af91cf..786b2a8 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelPackageImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGModelPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNamedElementImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNamedElementImpl.java
index 5eae6c5..2998dc4 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNamedElementImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNamedElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativeOperationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativeOperationCallExpImpl.java
index f36eadb..a26b2fd 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativeOperationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativeOperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativeOperationImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativeOperationImpl.java
index 608b009..c16d5e4 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativeOperationImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativeOperationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativePropertyCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativePropertyCallExpImpl.java
index 355059e..cc36570 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativePropertyCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativePropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativePropertyImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativePropertyImpl.java
index 47a77bd..d0266cd 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativePropertyImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNativePropertyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNavigationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNavigationCallExpImpl.java
index 117a362..cfb991f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNavigationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNavigationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNullImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNullImpl.java
index 862f87c..3e4198b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNullImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNullImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNumberImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNumberImpl.java
index 4257dfb..82ea12c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNumberImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGNumberImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOperationCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOperationCallExpImpl.java
index 4432439..4c7eddf 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOperationCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOperationImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOperationImpl.java
index 9aee9ce..e6d404a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOperationImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOperationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOppositePropertyCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOppositePropertyCallExpImpl.java
index 9ccbddd..c20bb19 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOppositePropertyCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGOppositePropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPackageImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPackageImpl.java
index 4f5cff0..0db95be 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPackageImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGParameterImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGParameterImpl.java
index d2616b3..bf3770d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGParameterImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGParameterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPropertyCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPropertyCallExpImpl.java
index 750104a..52386c3 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPropertyCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPropertyImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPropertyImpl.java
index 7784a1b..a33449c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPropertyImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGPropertyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGRealImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGRealImpl.java
index ca8ccfe..c31e19a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGRealImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGRealImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGSettableVariableImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGSettableVariableImpl.java
index 95eafae..0d2c26b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGSettableVariableImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGSettableVariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGShadowExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGShadowExpImpl.java
index 7711c63..889b719 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGShadowExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGShadowExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGShadowPartImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGShadowPartImpl.java
index a5b5b34..be2e2f3 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGShadowPartImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGShadowPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGStringImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGStringImpl.java
index 6fa2a27..7494558 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGStringImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGStringImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTextImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTextImpl.java
index c83b0e4..43ae007 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTextImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTextImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGThrowExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGThrowExpImpl.java
index acbebad..dc13a17 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGThrowExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGThrowExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTupleExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTupleExpImpl.java
index 9107504..3b2842c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTupleExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTupleExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTuplePartCallExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTuplePartCallExpImpl.java
index aeeda3a..0321e82 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTuplePartCallExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTuplePartCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTuplePartImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTuplePartImpl.java
index 1275a39..8fa302c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTuplePartImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTuplePartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypeExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypeExpImpl.java
index fc22f20..2de75bd 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypeExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypeExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypeIdImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypeIdImpl.java
index 1d419b2..a1a982c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypeIdImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypedElementImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypedElementImpl.java
index 73a2b08..0f10891 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypedElementImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGTypedElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGUnboxExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGUnboxExpImpl.java
index 1d1e2a7..aaa4d87 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGUnboxExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGUnboxExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGUnlimitedImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGUnlimitedImpl.java
index 5cb7c18..bb87881 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGUnlimitedImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGUnlimitedImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGValuedElementImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGValuedElementImpl.java
index 687efcd..4608935 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGValuedElementImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGValuedElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableExpImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableExpImpl.java
index f5200a3..3a173dc 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableExpImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableImpl.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableImpl.java
index 96a39f0..228f592 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/impl/CGVariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractCGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractCGModelVisitor.java
index b69ed2e..856e475 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractCGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractCGModelVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractExtendingCGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractExtendingCGModelVisitor.java
index be32599..792bd2e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractExtendingCGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractExtendingCGModelVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNonNullExtendingCGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNonNullExtendingCGModelVisitor.java
index 3d74c9c..6e49802 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNonNullExtendingCGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNonNullExtendingCGModelVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNullCGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNullCGModelVisitor.java
index 55e89b8..aa7ce52 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNullCGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/AbstractNullCGModelVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelAdapterFactory.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelAdapterFactory.java
index 37c7579..6e5751b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelSwitch.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelSwitch.java
index e1ad696..5165e76 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelSwitch.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelVisitor.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelVisitor.java
index f96c043..fd0443d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/cgmodel/util/CGModelVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/model/CGLibrary.java b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/model/CGLibrary.java
index 66dd011..220a3a6 100644
--- a/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/model/CGLibrary.java
+++ b/examples/org.eclipse.ocl.examples.codegen/emf-gen/org/eclipse/ocl/examples/codegen/model/CGLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/model/CGLibrary.genmodel b/examples/org.eclipse.ocl.examples.codegen/model/CGLibrary.genmodel
index 2eb71a7..3c990f5 100644
--- a/examples/org.eclipse.ocl.examples.codegen/model/CGLibrary.genmodel
+++ b/examples/org.eclipse.ocl.examples.codegen/model/CGLibrary.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:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-    copyrightText="Copyright (c) 2015, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    copyrightText="Copyright (c) 2015, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.examples.codegen/emf-gen" editDirectory="/org.eclipse.ocl.examples.codegen.edit/emf-gen"
     editorDirectory="/org.eclipse.ocl.examples.codegen.editor/emf-gen" modelPluginID="org.eclipse.ocl.examples.codegen"
     modelName="CGLibrary" updateClasspath="false" nonNLSMarkers="true" suppressInterfaces="true"
diff --git a/examples/org.eclipse.ocl.examples.codegen/model/cgmodel.genmodel b/examples/org.eclipse.ocl.examples.codegen/model/cgmodel.genmodel
index 2124dd6..f66831c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/model/cgmodel.genmodel
+++ b/examples/org.eclipse.ocl.examples.codegen/model/cgmodel.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="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2015, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2015, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved.   This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.ocl.examples.codegen/emf-gen" editDirectory="/org.eclipse.ocl.examples.codegen.edit/emf-gen"
     editorDirectory="/org.eclipse.ocl.examples.codegen.editor/emf-gen" modelPluginID="org.eclipse.ocl.examples.codegen"
     modelName="Cgmodel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
diff --git a/examples/org.eclipse.ocl.examples.codegen/plugin.properties b/examples/org.eclipse.ocl.examples.codegen/plugin.properties
index 2d020ca..ab86129 100644
--- a/examples/org.eclipse.ocl.examples.codegen/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.codegen/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/CodeGenConstants.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/CodeGenConstants.java
index 4b43150..f77cdd1 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/CodeGenConstants.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/CodeGenConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/AS2CGVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/AS2CGVisitor.java
index d3b7998..835d4ef 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/AS2CGVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/AS2CGVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/AnalysisVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/AnalysisVisitor.java
index acfcea4..dc97efa 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/AnalysisVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/AnalysisVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/BoxingAnalyzer.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/BoxingAnalyzer.java
index 96ee967..2798785 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/BoxingAnalyzer.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/BoxingAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CG2StringVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CG2StringVisitor.java
index af767d1..e2ccf13 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CG2StringVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CG2StringVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CGUtils.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CGUtils.java
index 879036b..ba883b3 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CGUtils.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CGUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CodeGenAnalyzer.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CodeGenAnalyzer.java
index e9acd6d..436c0fa 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CodeGenAnalyzer.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/CodeGenAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/DependencyVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/DependencyVisitor.java
index 79e23f0..d72309b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/DependencyVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/DependencyVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/FieldingAnalyzer.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/FieldingAnalyzer.java
index dba5c28..4a212fa 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/FieldingAnalyzer.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/FieldingAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/NameManager.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/NameManager.java
index 9882601..e185219 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/NameManager.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/NameManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/ReferencesVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/ReferencesVisitor.java
index 97c12a0..21f627f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/ReferencesVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/analyzer/ReferencesVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/asm5/ASM5JavaAnnotationReader.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/asm5/ASM5JavaAnnotationReader.java
index d67a803..360246e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/asm5/ASM5JavaAnnotationReader.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/asm5/ASM5JavaAnnotationReader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/CodeGenHelper.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/CodeGenHelper.java
index 6321bf6..e1dfdc7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/CodeGenHelper.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/CodeGenHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/NameQueries.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/NameQueries.java
index 53c3388..c9f0603 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/NameQueries.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/NameQueries.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/PivotQueries.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/PivotQueries.java
index 9ab7165..dc7b10f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/PivotQueries.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/common/PivotQueries.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/AbstractAnalysis.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/AbstractAnalysis.java
index f59bd1a..20280a2 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/AbstractAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/AbstractAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/AbstractPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/AbstractPlace.java
index cf65a70..00b196a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/AbstractPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/AbstractPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CatchPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CatchPlace.java
index 7e5c04d..d451c68 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CatchPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CatchPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CommonAnalysis.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CommonAnalysis.java
index 626b472..1b3011e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CommonAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CommonAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CommonSubexpressionEliminator.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CommonSubexpressionEliminator.java
index 60d5728..ba81ddc 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CommonSubexpressionEliminator.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/CommonSubexpressionEliminator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/ControlPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/ControlPlace.java
index 0fe3ea1..e0f680f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/ControlPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/ControlPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/GlobalPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/GlobalPlace.java
index 31969f3..e4a8d72 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/GlobalPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/GlobalPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/HashedAnalyses.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/HashedAnalyses.java
index 029ba2f..bc7aad7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/HashedAnalyses.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/HashedAnalyses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/IfPlaces.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/IfPlaces.java
index 7596131..9196241 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/IfPlaces.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/IfPlaces.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/InnerStackPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/InnerStackPlace.java
index bb8acdf..601ea8f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/InnerStackPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/InnerStackPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/LetPlaces.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/LetPlaces.java
index 3d48f1e..844e49e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/LetPlaces.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/LetPlaces.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/LocalPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/LocalPlace.java
index bb90e7a..13b86d4 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/LocalPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/LocalPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/OuterStackPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/OuterStackPlace.java
index 49506e8..bd9f337 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/OuterStackPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/OuterStackPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/SimpleAnalysis.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/SimpleAnalysis.java
index b529b4c..3b0dbf9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/SimpleAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/SimpleAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/StackPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/StackPlace.java
index 09195b5..7881eac 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/StackPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/StackPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/ThrowPlace.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/ThrowPlace.java
index 563b567..69b1b50 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/ThrowPlace.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/cse/ThrowPlace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/ExplicitClassLoader.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/ExplicitClassLoader.java
index 4c5c486..ed7c92d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/ExplicitClassLoader.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/ExplicitClassLoader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaFileUtil.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaFileUtil.java
index a1a721a..041c363 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaFileUtil.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaFileUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaGenModelCodeGenHelper.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaGenModelCodeGenHelper.java
index 32bcc6f..35aaf30 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaGenModelCodeGenHelper.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaGenModelCodeGenHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaSourceFileObject.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaSourceFileObject.java
index dfc6707..6cb770f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaSourceFileObject.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/JavaSourceFileObject.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/OCL2JavaFileObject.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/OCL2JavaFileObject.java
index dedd62a..501312b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/OCL2JavaFileObject.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/dynamic/OCL2JavaFileObject.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/AbstractCodeGenerator.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/AbstractCodeGenerator.java
index 865fe0f..1e795e6 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/AbstractCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/AbstractCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/AbstractGenModelHelper.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/AbstractGenModelHelper.java
index 341116c..5041ef7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/AbstractGenModelHelper.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/AbstractGenModelHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenException.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenException.java
index bd81f32..079b1f3 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenException.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenOptions.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenOptions.java
index fae08f7..5605ab9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenOptions.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenerator.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenerator.java
index 74f5c2f..174e949 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/CodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GenModelException.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GenModelException.java
index 58ea809..9082ec0 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GenModelException.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GenModelException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GenModelHelper.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GenModelHelper.java
index fff9ddf..8d70be7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GenModelHelper.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GenModelHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GlobalContext.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GlobalContext.java
index 9198f1c..76b8117 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GlobalContext.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/GlobalContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/IterationHelper.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/IterationHelper.java
index 41f9eea..81f6aa1 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/IterationHelper.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/IterationHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/LocalContext.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/LocalContext.java
index c085b2c..22324b7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/LocalContext.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/LocalContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/TypeDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/TypeDescriptor.java
index b4aecbe..5a2d56f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/TypeDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/generator/TypeDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/AbstractId2JavaClassVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/AbstractId2JavaClassVisitor.java
index 78415e0..8c35e71 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/AbstractId2JavaClassVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/AbstractId2JavaClassVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/AbstractJavaContext.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/AbstractJavaContext.java
index a126696..07870e3 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/AbstractJavaContext.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/AbstractJavaContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/CG2JavaPreVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/CG2JavaPreVisitor.java
index 7917684..9790319 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/CG2JavaPreVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/CG2JavaPreVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/CG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/CG2JavaVisitor.java
index 59f9eeb..cbb3fd0 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/CG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/CG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2EClassVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2EClassVisitor.java
index 3cc9e43..8745df5 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2EClassVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2EClassVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2JavaExpressionVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2JavaExpressionVisitor.java
index 5d09df9..018dcd6 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2JavaExpressionVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2JavaExpressionVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2JavaInterfaceVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2JavaInterfaceVisitor.java
index 9a0922e..bbb541e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2JavaInterfaceVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Id2JavaInterfaceVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/ImportUtils.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/ImportUtils.java
index bd091d6..c3ac5a7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/ImportUtils.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/ImportUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Iteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Iteration2Java.java
index 74358e2..a934e7c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Iteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/Iteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaCodeGenerator.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaCodeGenerator.java
index ad23e85..c88fb69 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaConstants.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaConstants.java
index d669bbd..09d2063 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaConstants.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaDependencyVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaDependencyVisitor.java
index f5ca9d7..d606482 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaDependencyVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaDependencyVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaGlobalContext.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaGlobalContext.java
index 04cad2a..fcad8bb 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaGlobalContext.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaGlobalContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaLocalContext.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaLocalContext.java
index c2c42e9..aad2357 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaLocalContext.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaLocalContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaStream.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaStream.java
index 4726d8f..0924a36 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaStream.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/JavaStream.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AbstractAccumulation2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AbstractAccumulation2Java.java
index de45b07..4da2c23 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AbstractAccumulation2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AbstractAccumulation2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AbstractIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AbstractIteration2Java.java
index 42af54d..3233526 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AbstractIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AbstractIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AnyIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AnyIteration2Java.java
index 700f4d6..3949684 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AnyIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/AnyIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/CollectIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/CollectIteration2Java.java
index c01b4e9..c0eada1 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/CollectIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/CollectIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/CollectNestedIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/CollectNestedIteration2Java.java
index 3d88231..519fb81 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/CollectNestedIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/CollectNestedIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/ExistsIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/ExistsIteration2Java.java
index 94370b8..9d9b88a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/ExistsIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/ExistsIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/ForAllIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/ForAllIteration2Java.java
index 1ff1c0d..c92391d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/ForAllIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/ForAllIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/IsUniqueIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/IsUniqueIteration2Java.java
index 5d86255..a206fd8 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/IsUniqueIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/IsUniqueIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/IterateIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/IterateIteration2Java.java
index 3d3965c..5a16ebd 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/IterateIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/IterateIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/OneIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/OneIteration2Java.java
index 085b48f..8373e36 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/OneIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/OneIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/RejectIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/RejectIteration2Java.java
index 1e532107..381f90e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/RejectIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/RejectIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/SelectIteration2Java.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/SelectIteration2Java.java
index 4e07bcd..219e87d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/SelectIteration2Java.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/iteration/SelectIteration2Java.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractCollectionDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractCollectionDescriptor.java
index f25d6cc..82c9c21 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractCollectionDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractCollectionDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractDescriptor.java
index 566313c..c453cdc 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractPrimitiveDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractPrimitiveDescriptor.java
index e54dd93..1f72f12 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractPrimitiveDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractPrimitiveDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractValueDescriptor.java
index c10adeb..be1684a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/AbstractValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BooleanObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BooleanObjectDescriptor.java
index c0084de..345b5ea 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BooleanObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BooleanObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BooleanPrimitiveDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BooleanPrimitiveDescriptor.java
index 711e3e2..1ffae94 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BooleanPrimitiveDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BooleanPrimitiveDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedDescriptor.java
index 7a777e7..3eff3c4 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedMapDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedMapDescriptor.java
index 28b8da7..b652a84 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedMapDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedMapDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedValueDescriptor.java
index d097b66..cb04643 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedValuesDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedValuesDescriptor.java
index 7281ac2..f217f10 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedValuesDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/BoxedValuesDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/CollectionDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/CollectionDescriptor.java
index 8ee724c..ec305be 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/CollectionDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/CollectionDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/DoublePrimitiveDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/DoublePrimitiveDescriptor.java
index 0c36113..9888551 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/DoublePrimitiveDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/DoublePrimitiveDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EObjectDescriptor.java
index c1cbb35..7fa0964 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EObjectsDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EObjectsDescriptor.java
index e6fb107..9ce63f4 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EObjectsDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EObjectsDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreDescriptor.java
index 371849c..3d5828c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreDoubleObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreDoubleObjectDescriptor.java
index 43eb4fe..8242a4d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreDoubleObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreDoubleObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreIntegerObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreIntegerObjectDescriptor.java
index b870bd4..ed3632e 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreIntegerObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreIntegerObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreListDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreListDescriptor.java
index ebbee28..6e97c9b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreListDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EcoreListDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EnumerationObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EnumerationObjectDescriptor.java
index e72f11e..3eb5e8a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EnumerationObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EnumerationObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EnumerationValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EnumerationValueDescriptor.java
index 96d4e79..91fd2ec 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EnumerationValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/EnumerationValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FloatPrimitiveDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FloatPrimitiveDescriptor.java
index a2f7b27..6959d2f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FloatPrimitiveDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FloatPrimitiveDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEObjectDescriptor.java
index 6fd3d80..375869b 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEObjectsDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEObjectsDescriptor.java
index c068f7b..0eda482 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEObjectsDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEObjectsDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEnumerationObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEnumerationObjectDescriptor.java
index 8b24ef4..63f23ef 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEnumerationObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEnumerationObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEnumerationValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEnumerationValueDescriptor.java
index 4529bc6..8cf6dda 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEnumerationValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/FutureEnumerationValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/Id2BoxedDescriptorVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/Id2BoxedDescriptorVisitor.java
index a796676..b5e3786 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/Id2BoxedDescriptorVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/Id2BoxedDescriptorVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntPrimitiveDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntPrimitiveDescriptor.java
index 8aa48d6..ddea123 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntPrimitiveDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntPrimitiveDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntegerObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntegerObjectDescriptor.java
index 2dc3b72..eaad4be 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntegerObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntegerObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntegerValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntegerValueDescriptor.java
index 7ab69be..e15dff9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntegerValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/IntegerValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/JavaTypeId.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/JavaTypeId.java
index 75e8feb..28bff99 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/JavaTypeId.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/JavaTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/LongPrimitiveDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/LongPrimitiveDescriptor.java
index 6b10fb8..84a0eb1 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/LongPrimitiveDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/LongPrimitiveDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/MapDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/MapDescriptor.java
index 8054b33..2cf0e58 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/MapDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/MapDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/PrimitiveValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/PrimitiveValueDescriptor.java
index edd6995..c6e01a7 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/PrimitiveValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/PrimitiveValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RealObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RealObjectDescriptor.java
index fa293ee..6ebb37c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RealObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RealObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RealValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RealValueDescriptor.java
index 9753169..a13ad43 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RealValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RealValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RootObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RootObjectDescriptor.java
index 4acf64f..1a4cde8 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RootObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/RootObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/ShortPrimitiveDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/ShortPrimitiveDescriptor.java
index 38dadc2..76974d9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/ShortPrimitiveDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/ShortPrimitiveDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleDataTypeDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleDataTypeDescriptor.java
index 6721191..6fdffbe 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleDataTypeDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleDataTypeDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleDescriptor.java
index 57d637f..7b3bede 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleValueDescriptor.java
index 98c8253..3b7bdff 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/SimpleValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedDescriptor.java
index 2f1faa8..bc94bf9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedElementsDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedElementsDescriptor.java
index 9c8902c..10773f6 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedElementsDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedElementsDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedMapDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedMapDescriptor.java
index 3611648..cb1152f 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedMapDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedMapDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedValueDescriptor.java
index 3bc6cd6..a01d9e3 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnboxedValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnlimitedNaturalObjectDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnlimitedNaturalObjectDescriptor.java
index 3874d03..5df1889 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnlimitedNaturalObjectDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnlimitedNaturalObjectDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnlimitedNaturalValueDescriptor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnlimitedNaturalValueDescriptor.java
index 1c7e4c1..5783ff6 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnlimitedNaturalValueDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/java/types/UnlimitedNaturalValueDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeProperty.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeProperty.java
index 8cb1531..8b1bab9 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeProperty.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeStaticOperation.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeStaticOperation.java
index ef5ac1e..29c9bc0 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeStaticOperation.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeStaticOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeVisitorOperation.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeVisitorOperation.java
index 25c313c..598f9ab 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeVisitorOperation.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/library/NativeVisitorOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreAS2CGVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreAS2CGVisitor.java
index d5b2191..5206096 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreAS2CGVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreAS2CGVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreCG2JavaVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreCG2JavaVisitor.java
index 13571b9..11170df 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreCG2JavaVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreCG2JavaVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreCodeGenerator.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreCodeGenerator.java
index f16b443..444e3ef 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java
index 93b4a64..6821d89 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGeneratorAdapterFactory.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGeneratorAdapterFactory.java
index f00e177..6fc9b8d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGeneratorAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGeneratorAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGlobalContext.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGlobalContext.java
index f2903f2..ec29465 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGlobalContext.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGlobalContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreLocalContext.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreLocalContext.java
index 61719bb..1460ac5 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreLocalContext.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreLocalContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTables.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTables.java
index ed1c352..04216cb 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTables.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTables.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java
index a720d8b..b26d5b0 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitAS2CGVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitAS2CGVisitor.java
index fd7073b..1488d4a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitAS2CGVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitAS2CGVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitCG2JavaClassVisitor.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitCG2JavaClassVisitor.java
index 412e68f..de97929 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitCG2JavaClassVisitor.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitCG2JavaClassVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitCodeGenerator.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitCodeGenerator.java
index 69677cf..651746d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitCodeGenerator.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinjunit/JUnitCodeGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/AbstractCGModelResourceFactory.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/AbstractCGModelResourceFactory.java
index 4d03d44..b9fcf05 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/AbstractCGModelResourceFactory.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/AbstractCGModelResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResource.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResource.java
index db9ff96..49ddfba 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResource.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResourceFactory.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResourceFactory.java
index 40081d9..db9002a 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResourceFactory.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResourceImpl.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResourceImpl.java
index df0fa25..5bf8a8c 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResourceImpl.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGModelResourceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGUtil.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGUtil.java
index beedc63..fd1321d 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGUtil.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/CGUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/EquivalenceUtil.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/EquivalenceUtil.java
index 36774e0..d4fdfd8 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/EquivalenceUtil.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/EquivalenceUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/RereferencingCopier.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/RereferencingCopier.java
index 42e0bfd..139bdd1 100644
--- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/RereferencingCopier.java
+++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/utilities/RereferencingCopier.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.common/about.html b/examples/org.eclipse.ocl.examples.common/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.common/about.html
+++ b/examples/org.eclipse.ocl.examples.common/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.common/build.properties b/examples/org.eclipse.ocl.examples.common/build.properties
index 09d4e46..1f58fd7 100644
--- a/examples/org.eclipse.ocl.examples.common/build.properties
+++ b/examples/org.eclipse.ocl.examples.common/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.common/plugin.properties b/examples/org.eclipse.ocl.examples.common/plugin.properties
index 0a5c4bf..aa88195 100644
--- a/examples/org.eclipse.ocl.examples.common/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.common/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.common/schema/label_generator.exsd b/examples/org.eclipse.ocl.examples.common/schema/label_generator.exsd
index 1e17e49..1fb8b5d 100644
--- a/examples/org.eclipse.ocl.examples.common/schema/label_generator.exsd
+++ b/examples/org.eclipse.ocl.examples.common/schema/label_generator.exsd
@@ -135,8 +135,8 @@
       </appinfo>
       <documentation>
          Copyright (c) 2010 Willink Transformations and others.&lt;br&gt;
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at &lt;a 
+href=&quot;http://www.eclipse.org/legal/epl-v20.html&quot;&gt;http://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/plugin/OCLExamplesCommonPlugin.java b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/plugin/OCLExamplesCommonPlugin.java
index e27abb9..92cef0c 100644
--- a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/plugin/OCLExamplesCommonPlugin.java
+++ b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/plugin/OCLExamplesCommonPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/ClassUtils.java b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/ClassUtils.java
index 6d5bbfe..7e7489b 100644
--- a/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/ClassUtils.java
+++ b/examples/org.eclipse.ocl.examples.common/src/org/eclipse/ocl/examples/common/utils/ClassUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/about.html b/examples/org.eclipse.ocl.examples.debug.ui/about.html
index 10b39ee..2619677 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/about.html
+++ b/examples/org.eclipse.ocl.examples.debug.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/build.properties b/examples/org.eclipse.ocl.examples.debug.ui/build.properties
index 0a0e53d..0fd9bba 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/build.properties
+++ b/examples/org.eclipse.ocl.examples.debug.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/plugin.properties b/examples/org.eclipse.ocl.examples.debug.ui/plugin.properties
index cd0d306..c2600ee 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.debug.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/OCLDebugUIPlugin.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/OCLDebugUIPlugin.java
index 052bafe..c644fd2 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/OCLDebugUIPlugin.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/OCLDebugUIPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLRetargettableActionAdapterFactory.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLRetargettableActionAdapterFactory.java
index 2324cb9..bd13607 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLRetargettableActionAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLRetargettableActionAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLRunToLineAdapter.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLRunToLineAdapter.java
index 868d834..1bb5919 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLRunToLineAdapter.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLRunToLineAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLToggleBreakpointAdapter.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLToggleBreakpointAdapter.java
index bdca876..9a12585 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLToggleBreakpointAdapter.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/CompleteOCLToggleBreakpointAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/DebugDialog.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/DebugDialog.java
index 66ff5dd..8f138b4 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/DebugDialog.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/DebugDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/DebugHandler.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/DebugHandler.java
index f79cbb2..5fd0a56 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/DebugHandler.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/DebugHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointLocationVerifier.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointLocationVerifier.java
index 2a9ea0a..eef2fa6 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointLocationVerifier.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointLocationVerifier.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointPropertiesAction.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointPropertiesAction.java
index f385c98..1f5f1eb 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointPropertiesAction.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointPropertiesAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointPropertiesRulerActionDelegate.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointPropertiesRulerActionDelegate.java
index fc73429..ca50ef5 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointPropertiesRulerActionDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLBreakpointPropertiesRulerActionDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreRetargettableActionAdapterFactory.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreRetargettableActionAdapterFactory.java
index cd8d951..bb6cb96 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreRetargettableActionAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreRetargettableActionAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreRunToLineAdapter.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreRunToLineAdapter.java
index 0465f70..7532e64 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreRunToLineAdapter.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreRunToLineAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreToggleBreakpointAdapter.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreToggleBreakpointAdapter.java
index d9fc4ed..7ecf51f 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreToggleBreakpointAdapter.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/actions/OCLinEcoreToggleBreakpointAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugInvocationDelegate.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugInvocationDelegate.java
index 1c546ad..3399d07 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugInvocationDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugInvocationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugInvocationDelegateFactory.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugInvocationDelegateFactory.java
index f9e4352..7f44eac 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugInvocationDelegateFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugInvocationDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugQueryDelegate.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugQueryDelegate.java
index e1638e3..949dae9 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugQueryDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugQueryDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugQueryDelegateFactory.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugQueryDelegateFactory.java
index 8821585..d79a049 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugQueryDelegateFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugQueryDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugSettingDelegate.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugSettingDelegate.java
index eb8f0a0..46f494c 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugSettingDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugSettingDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugSettingDelegateFactory.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugSettingDelegateFactory.java
index 8461cf0..2299a0b 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugSettingDelegateFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugSettingDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugValidationDelegate.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugValidationDelegate.java
index 43ad790..40b2c2f 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugValidationDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugValidationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugValidationDelegateFactory.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugValidationDelegateFactory.java
index b50b37f..87d64a8 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugValidationDelegateFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/delegate/OCLDebugValidationDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/AbstractMainTab.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/AbstractMainTab.java
index 9edc406..54f0ca9 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/AbstractMainTab.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/AbstractMainTab.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/LaunchConfigurationTabGroup.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/LaunchConfigurationTabGroup.java
index fc5762b..5823f2d 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/LaunchConfigurationTabGroup.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/LaunchConfigurationTabGroup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/MainTab.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/MainTab.java
index 523dab9..6368a89 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/MainTab.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/launching/MainTab.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/messages/DebugUIMessages.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/messages/DebugUIMessages.java
index 1303fd6..7d5ef89 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/messages/DebugUIMessages.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/messages/DebugUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/messages/DebugUIMessages.properties b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/messages/DebugUIMessages.properties
index 34406d9..92533ec 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/messages/DebugUIMessages.properties
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/messages/DebugUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLBreakpointPage.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLBreakpointPage.java
index 63a21a1..f7057a4 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLBreakpointPage.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLBreakpointPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLDebugModelPresentation.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLDebugModelPresentation.java
index be2ffbe..a1315fd 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLDebugModelPresentation.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLDebugModelPresentation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLLineBreakpointPage.java b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLLineBreakpointPage.java
index 3524ddb..5e5f6a3 100644
--- a/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLLineBreakpointPage.java
+++ b/examples/org.eclipse.ocl.examples.debug.ui/src/org/eclipse/ocl/examples/debug/ui/pages/OCLLineBreakpointPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/about.html b/examples/org.eclipse.ocl.examples.debug.vm.ui/about.html
index 10b39ee..2619677 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/about.html
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/build.properties b/examples/org.eclipse.ocl.examples.debug.vm.ui/build.properties
index b7dc1a2..c47dd52 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/build.properties
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/plugin.properties b/examples/org.eclipse.ocl.examples.debug.vm.ui/plugin.properties
index 0e54ef8..14b14f5 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/DebugVMUIPlugin.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/DebugVMUIPlugin.java
index 3b9927f..84a56e9 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/DebugVMUIPlugin.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/DebugVMUIPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/AbstractVMBreakpointPropertiesHandler.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/AbstractVMBreakpointPropertiesHandler.java
index 07038a6..affd586 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/AbstractVMBreakpointPropertiesHandler.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/AbstractVMBreakpointPropertiesHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - revised from IActionDelegaye to IHandler
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/BreakpointLocationVerifier.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/BreakpointLocationVerifier.java
index 92982e0..d0eabcf 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/BreakpointLocationVerifier.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/BreakpointLocationVerifier.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/DebugVMImages.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/DebugVMImages.java
index 2cbaf2d..47d4b88 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/DebugVMImages.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/DebugVMImages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesAction.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesAction.java
index dd87e05..1811f37 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesAction.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesHandler.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesHandler.java
index 2c6de3a..c60cf4a 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesHandler.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - revised from IActionDelegaye to IHandler
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesRulerAction.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesRulerAction.java
index 0798f70..f43e899 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesRulerAction.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesRulerAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesRulerActionDelegate.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesRulerActionDelegate.java
index 0089448..3fcb1a0 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesRulerActionDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMBreakpointPropertiesRulerActionDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMEnableDisableBreakpointHandler.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMEnableDisableBreakpointHandler.java
index 65d8b8b..f2e4864 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMEnableDisableBreakpointHandler.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMEnableDisableBreakpointHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - revised from IActionDelegaye to IHandler
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMRunToLineAdapter.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMRunToLineAdapter.java
index 946a346..2a2286e 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMRunToLineAdapter.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMRunToLineAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMToggleBreakpointAdapter.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMToggleBreakpointAdapter.java
index 064f328..a517cf3 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMToggleBreakpointAdapter.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMToggleBreakpointAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMToggleBreakpointHandler.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMToggleBreakpointHandler.java
index 4bc5bc8..c1d93f7 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMToggleBreakpointHandler.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/actions/VMToggleBreakpointHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - revised from IActionDelegaye to IHandler
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/launching/LaunchingUtils.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/launching/LaunchingUtils.java
index 7faf089..11c2f53 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/launching/LaunchingUtils.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/launching/LaunchingUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/messages/DebugVMUIMessages.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/messages/DebugVMUIMessages.java
index 0df1749..e8389d5 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/messages/DebugVMUIMessages.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/messages/DebugVMUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/messages/DebugVMUIMessages.properties b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/messages/DebugVMUIMessages.properties
index a7bcc0e..ea2d614 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/messages/DebugVMUIMessages.properties
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/messages/DebugVMUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/BreakpointConditionEditor.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/BreakpointConditionEditor.java
index 9ff4340..2499755 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/BreakpointConditionEditor.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/BreakpointConditionEditor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/SWTFactory.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/SWTFactory.java
index 835e6fb..c968bfa 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/SWTFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/SWTFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMBreakpointPage.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMBreakpointPage.java
index 4c21122..30c320d 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMBreakpointPage.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMBreakpointPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMDebugModelPresentation.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMDebugModelPresentation.java
index fef2e1e..3c2397a 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMDebugModelPresentation.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMDebugModelPresentation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMLineBreakpointPage.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMLineBreakpointPage.java
index 755bdd5..7dc27e1 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMLineBreakpointPage.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/pages/VMLineBreakpointPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/utils/DebugUtil.java b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/utils/DebugUtil.java
index de1569f..6ae4e64 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/utils/DebugUtil.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm.ui/src/org/eclipse/ocl/examples/debug/vm/ui/utils/DebugUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/about.html b/examples/org.eclipse.ocl.examples.debug.vm/about.html
index 10b39ee..2619677 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/about.html
+++ b/examples/org.eclipse.ocl.examples.debug.vm/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/build.properties b/examples/org.eclipse.ocl.examples.debug.vm/build.properties
index 0ba4c8d..17fb491 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/build.properties
+++ b/examples/org.eclipse.ocl.examples.debug.vm/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/plugin.properties b/examples/org.eclipse.ocl.examples.debug.vm/plugin.properties
index 8a76ca0..0a3624b 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.debug.vm/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/BreakpointError.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/BreakpointError.java
index 8de371f..a84df51 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/BreakpointError.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/BreakpointError.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/ConditionChecker.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/ConditionChecker.java
index 86c39ff..22b99c1 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/ConditionChecker.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/ConditionChecker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/DebugVMPlugin.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/DebugVMPlugin.java
index 8385560..b8567c8 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/DebugVMPlugin.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/DebugVMPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/IVMDebuggerShell.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/IVMDebuggerShell.java
index ec69baf..8971f32 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/IVMDebuggerShell.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/IVMDebuggerShell.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/IVMVirtualMachineShell.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/IVMVirtualMachineShell.java
index af08a73..8f6ada9 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/IVMVirtualMachineShell.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/IVMVirtualMachineShell.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/UnitLocation.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/UnitLocation.java
index ca72eb3..8964122 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/UnitLocation.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/UnitLocation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/UnitManager.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/UnitManager.java
index f4fb0e6..50d9a66 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/UnitManager.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/UnitManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMBreakpoint.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMBreakpoint.java
index f06e790..e28127f 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMBreakpoint.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMBreakpoint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMBreakpointManager.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMBreakpointManager.java
index e60d140..2838007 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMBreakpointManager.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMBreakpointManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMEventListener.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMEventListener.java
index 3903479..a9ed217 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMEventListener.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMEventListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMRemoteClient.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMRemoteClient.java
index e38b55e..7095575 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMRemoteClient.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMRemoteClient.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMVirtualMachine.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMVirtualMachine.java
index 53dd04d..92e347d 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMVirtualMachine.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VMVirtualMachine.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/ValidBreakpointLocator.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/ValidBreakpointLocator.java
index abbfed3..8d43021 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/ValidBreakpointLocator.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/ValidBreakpointLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VariableFinder.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VariableFinder.java
index 24a803c..6acca7c 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VariableFinder.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/VariableFinder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/EvaluationContext.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/EvaluationContext.java
index 61a0364..7d7f846 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/EvaluationContext.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/EvaluationContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/IVMDebugTarget.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/IVMDebugTarget.java
index 9a5331e..7dd0866 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/IVMDebugTarget.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/IVMDebugTarget.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugCore.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugCore.java
index 2b3af41..7a46ad1 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugCore.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugCore.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugElement.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugElement.java
index 0e090cc..e1a9754 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugElement.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugTarget.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugTarget.java
index f43a463..614ed17 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugTarget.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMDebugTarget.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLineBreakpoint.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLineBreakpoint.java
index dd84f95..8ca7f8b 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLineBreakpoint.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLineBreakpoint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLocalValue.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLocalValue.java
index 94da94e..95de1dc 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLocalValue.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLocalValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLocalVariable.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLocalVariable.java
index 0303b31..dfb4499 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLocalVariable.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMLocalVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMStackFrame.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMStackFrame.java
index 7eead8b..8643481 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMStackFrame.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMStackFrame.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMThread.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMThread.java
index 800fbe9..403b1de 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMThread.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMThread.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMValue.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMValue.java
index a07111e..a84b6c8 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMValue.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMVariable.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMVariable.java
index 74cabb6..0d31ff0 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMVariable.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMVirtualProcess.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMVirtualProcess.java
index ed2bafa..83a885e 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMVirtualProcess.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/core/VMVirtualProcess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMBreakpointData.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMBreakpointData.java
index efa1bc6..81ed7a2 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMBreakpointData.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMBreakpointData.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMLocationData.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMLocationData.java
index 847a184..2e02726 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMLocationData.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMLocationData.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMNewBreakpointData.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMNewBreakpointData.java
index 97fca5c..1be4f92 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMNewBreakpointData.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMNewBreakpointData.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMStackFrameData.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMStackFrameData.java
index cc4d5bc..bc4580f 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMStackFrameData.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMStackFrameData.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMSuspension.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMSuspension.java
index 5a31c76..81d4842 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMSuspension.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMSuspension.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMTypeData.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMTypeData.java
index c5dbe68..9416c0d 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMTypeData.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMTypeData.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMValueData.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMValueData.java
index fd75297..ae853f8 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMValueData.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMValueData.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMVariableData.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMVariableData.java
index 67199e4..97176a1 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMVariableData.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/data/VMVariableData.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/AbstractVMEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/AbstractVMEvaluationEnvironment.java
index 8683f54..f21741d 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/AbstractVMEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/AbstractVMEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/AbstractVMEvaluationStepper.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/AbstractVMEvaluationStepper.java
index 7a5926a..f1b399d 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/AbstractVMEvaluationStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/AbstractVMEvaluationStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 R.Dvorak 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Radek Dvorak - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IDebuggableRunnerFactory.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IDebuggableRunnerFactory.java
index 7f6f274..6dd9f41 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IDebuggableRunnerFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IDebuggableRunnerFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IStepper.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IStepper.java
index dc724fd..c78c758 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IStepperVisitor.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IStepperVisitor.java
index 528b835..4b00327 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IStepperVisitor.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IStepperVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IVMContext.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IVMContext.java
index b03ef80..2fdcc20 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IVMContext.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IVMContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IterateBreakpointHelper.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IterateBreakpointHelper.java
index 506f221..9da495c 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IterateBreakpointHelper.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/IterateBreakpointHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMContext.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMContext.java
index 1a83139..2f6a3ec 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMContext.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationEnvironment.java
index f0edb3b..e1a54c4 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationStepper.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationStepper.java
index fd055ef..e6d8860 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationVisitor.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationVisitor.java
index 12f1710..ac21332 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationVisitor.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMExecutor.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMExecutor.java
index 81c77b9..275d59e 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMExecutor.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMNestedEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMNestedEvaluationEnvironment.java
index d163933..ce1e6ec 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMNestedEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMNestedEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMRootEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMRootEvaluationEnvironment.java
index 5a8226d..60cfa2a 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMRootEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/evaluator/VMRootEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMDisconnectEvent.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMDisconnectEvent.java
index d875d7b..2d57eeb 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMDisconnectEvent.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMDisconnectEvent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMEvent.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMEvent.java
index e025cbe..e71f59d 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMEvent.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMEvent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMResumeEvent.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMResumeEvent.java
index 2dfef92..a517b7b 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMResumeEvent.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMResumeEvent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMStartEvent.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMStartEvent.java
index 468c6ea..d1f74fd 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMStartEvent.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMStartEvent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMSuspendEvent.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMSuspendEvent.java
index 06288df..0cc78bc 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMSuspendEvent.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMSuspendEvent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMTerminateEvent.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMTerminateEvent.java
index 2c039f6..678f84e 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMTerminateEvent.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/event/VMTerminateEvent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/DebuggableRunner.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/DebuggableRunner.java
index a290af3..0acd525 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/DebuggableRunner.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/DebuggableRunner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/DebuggableRunnerFactory.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/DebuggableRunnerFactory.java
index 544d0ae..4ff37ad 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/DebuggableRunnerFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/DebuggableRunnerFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/ExecutionContext.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/ExecutionContext.java
index 0daa4dc..d72b676 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/ExecutionContext.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/ExecutionContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/ExecutionContextImpl.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/ExecutionContextImpl.java
index 7c110c4..c729b53 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/ExecutionContextImpl.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/ExecutionContextImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/InternalDebuggableExecutor.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/InternalDebuggableExecutor.java
index 51f1ee4..6707ced 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/InternalDebuggableExecutor.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/InternalDebuggableExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/SourceModificationListener.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/SourceModificationListener.java
index e2d735b..83c36e1 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/SourceModificationListener.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/SourceModificationListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/VMDebuggableExecutorAdapter.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/VMDebuggableExecutorAdapter.java
index 2251899..29ab056 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/VMDebuggableExecutorAdapter.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/VMDebuggableExecutorAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/VMLaunchConfigurationDelegate.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/VMLaunchConfigurationDelegate.java
index ca20a6b..99825f1 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/VMLaunchConfigurationDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/launching/VMLaunchConfigurationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/messages/VMMessages.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/messages/VMMessages.java
index e1caba3..5b6d4cd 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/messages/VMMessages.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/messages/VMMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/messages/VMMessages.properties b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/messages/VMMessages.properties
index 6e6338c..2afea09 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/messages/VMMessages.properties
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/messages/VMMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMBreakpointRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMBreakpointRequest.java
index 86acecf..b2d73f9 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMBreakpointRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMBreakpointRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMConnectRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMConnectRequest.java
index 43e5e2d..a220ad6 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMConnectRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMConnectRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMDetailRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMDetailRequest.java
index 4ead03f..c499bd4 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMDetailRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMDetailRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMRequest.java
index 59c0a01..5097d01 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMResumeRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMResumeRequest.java
index 1fd6539..4aee876 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMResumeRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMResumeRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStackFrameRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStackFrameRequest.java
index 813bd0f..3ffc823 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStackFrameRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStackFrameRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStartRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStartRequest.java
index f39db59..75d8eca 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStartRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStartRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStepIntoRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStepIntoRequest.java
index 468913c..e849616 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStepIntoRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStepIntoRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStepOverRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStepOverRequest.java
index ffa42ff..aec1925 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStepOverRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMStepOverRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMSuspendRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMSuspendRequest.java
index 69f967d..1379381 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMSuspendRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMSuspendRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMTerminateRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMTerminateRequest.java
index c337da5..d2836a7 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMTerminateRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMTerminateRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMVariableRequest.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMVariableRequest.java
index 33a48ac..46b02e8 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMVariableRequest.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/request/VMVariableRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMBreakpointResponse.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMBreakpointResponse.java
index 55df74c..190dc4d 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMBreakpointResponse.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMBreakpointResponse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMConnectResponse.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMConnectResponse.java
index be4b898..9190742 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMConnectResponse.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMConnectResponse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMDetailResponse.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMDetailResponse.java
index 2c655f9..2fa1ef0 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMDetailResponse.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMDetailResponse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMResponse.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMResponse.java
index 65dafc5..9c67993 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMResponse.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMResponse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMStackFrameResponse.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMStackFrameResponse.java
index ec51f1e..1042d5a 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMStackFrameResponse.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMStackFrameResponse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMVariableResponse.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMVariableResponse.java
index 0e204f4..a770f05 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMVariableResponse.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/response/VMVariableResponse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourceLookupDirector.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourceLookupDirector.java
index 876e6aa..dfed845 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourceLookupDirector.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourceLookupDirector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourceLookupParticipant.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourceLookupParticipant.java
index 445f9c9..3088a9e 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourceLookupParticipant.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourceLookupParticipant.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourcePathComputer.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourcePathComputer.java
index ad78858..86c1513 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourcePathComputer.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/srclookup/VMSourcePathComputer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTBindingHelper.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTBindingHelper.java
index 6e77086..c5d0455 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTBindingHelper.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTBindingHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTSyntheticNode.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTSyntheticNode.java
index f9d2c50..ed44f24 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTSyntheticNode.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTSyntheticNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTSyntheticNodeAccess.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTSyntheticNodeAccess.java
index b50cecf..658ca1c 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTSyntheticNodeAccess.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ASTSyntheticNodeAccess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/BaseProcess.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/BaseProcess.java
index e8f4b65..57b04e6 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/BaseProcess.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/BaseProcess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/CompiledUnit.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/CompiledUnit.java
index 2e7acc3..565bb68 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/CompiledUnit.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/CompiledUnit.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/DebugOptions.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/DebugOptions.java
index ba4bfdd..26ba49a 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/DebugOptions.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/DebugOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/EmfUtil.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/EmfUtil.java
index 5eab04e..ed12eb2 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/EmfUtil.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/EmfUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ExecutionDiagnostic.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ExecutionDiagnostic.java
index 0afcacb..1b0b377 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ExecutionDiagnostic.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ExecutionDiagnostic.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ExecutionDiagnosticImpl.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ExecutionDiagnosticImpl.java
index 5815886..40d4358 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ExecutionDiagnosticImpl.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ExecutionDiagnosticImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/IModuleSourceInfo.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/IModuleSourceInfo.java
index 9eaad2b..17dde05 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/IModuleSourceInfo.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/IModuleSourceInfo.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/IVMStackTraceElement.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/IVMStackTraceElement.java
index 3faafc4..da6e1d5 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/IVMStackTraceElement.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/IVMStackTraceElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/LineNumberProvider.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/LineNumberProvider.java
index 45ae14d..e573d42 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/LineNumberProvider.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/LineNumberProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Log.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Log.java
index 279a689..6b88b2c 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Log.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Log.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Messages.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Messages.java
index 1747499..5491192 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Messages.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Messages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/MiscUtil.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/MiscUtil.java
index dae373e..ad1dc7e 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/MiscUtil.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/MiscUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/SafeRunner.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/SafeRunner.java
index 27b2f26..1e4e768 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/SafeRunner.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/SafeRunner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ShallowProcess.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ShallowProcess.java
index 9c7a794..256c22f 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ShallowProcess.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/ShallowProcess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/SocketUtil.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/SocketUtil.java
index 849eeab..632c976 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/SocketUtil.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/SocketUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/StreamsProxy.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/StreamsProxy.java
index bc6147e..a1335ed 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/StreamsProxy.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/StreamsProxy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Trace.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Trace.java
index a0a3589..2c45261 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Trace.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/Trace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMException.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMException.java
index 1eb24fb..e7a1ca0 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMException.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMInterruptedExecutionException.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMInterruptedExecutionException.java
index 9cd5c1c..7ba2883 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMInterruptedExecutionException.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMInterruptedExecutionException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMRuntimeException.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMRuntimeException.java
index d47760a..19d5cc9 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMRuntimeException.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMRuntimeException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackOverFlowError.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackOverFlowError.java
index a722ece..22bc60d 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackOverFlowError.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackOverFlowError.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceBuilder.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceBuilder.java
index 9cddf29..3a86218 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceBuilder.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceBuilder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceElement.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceElement.java
index 0fda6d4..71ecd00 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceElement.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/VMStackTraceElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/WriterLog.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/WriterLog.java
index 27c15e2..2d5af65 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/WriterLog.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/WriterLog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/WriterMonitor.java b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/WriterMonitor.java
index 8221afd..32fc4fc 100644
--- a/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/WriterMonitor.java
+++ b/examples/org.eclipse.ocl.examples.debug.vm/src/org/eclipse/ocl/examples/debug/vm/utils/WriterMonitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/about.html b/examples/org.eclipse.ocl.examples.debug/about.html
index 10b39ee..2619677 100644
--- a/examples/org.eclipse.ocl.examples.debug/about.html
+++ b/examples/org.eclipse.ocl.examples.debug/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.debug/build.properties b/examples/org.eclipse.ocl.examples.debug/build.properties
index 5085fc1..adb0951 100644
--- a/examples/org.eclipse.ocl.examples.debug/build.properties
+++ b/examples/org.eclipse.ocl.examples.debug/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/plugin.properties b/examples/org.eclipse.ocl.examples.debug/plugin.properties
index 1648a8c..4bd02e8 100644
--- a/examples/org.eclipse.ocl.examples.debug/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.debug/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/OCLBreakpoint.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/OCLBreakpoint.java
index 3e24659..afdfe9e 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/OCLBreakpoint.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/OCLBreakpoint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/OCLDebugPlugin.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/OCLDebugPlugin.java
index cab5b6e..98dc53c 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/OCLDebugPlugin.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/OCLDebugPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLDebugCore.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLDebugCore.java
index da38e06..6ccf42c 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLDebugCore.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLDebugCore.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLDebugTarget.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLDebugTarget.java
index 4cd9ff3..0a56e9b 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLDebugTarget.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLDebugTarget.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLEvaluationContext.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLEvaluationContext.java
index 2bf4b47..0b991e7 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLEvaluationContext.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLEvaluationContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLLineBreakpoint.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLLineBreakpoint.java
index 16ef96a..05ec6c2 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLLineBreakpoint.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLLineBreakpoint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLVirtualProcess.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLVirtualProcess.java
index 41ec065..1349af7 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLVirtualProcess.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/core/OCLVirtualProcess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLInvocationDelegate.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLInvocationDelegate.java
index f04c09f..d182e49 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLInvocationDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLInvocationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLQueryDelegate.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLQueryDelegate.java
index c4ebea9..8517787 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLQueryDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLQueryDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLSettingDelegate.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLSettingDelegate.java
index 36ad853..0c9d976 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLSettingDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLSettingDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLValidationDelegate.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLValidationDelegate.java
index 26cdc66..1ebdf5a 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLValidationDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/OCLValidationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/ValidationBehavior.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/ValidationBehavior.java
index dd10ab5..1c9b124 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/ValidationBehavior.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/delegate/ValidationBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLAbstractTracingEvaluationVisitor.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLAbstractTracingEvaluationVisitor.java
index 117fa48..1775a5c 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLAbstractTracingEvaluationVisitor.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLAbstractTracingEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLIsBreakpointableVisitor.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLIsBreakpointableVisitor.java
index f13c30a..5137fde 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLIsBreakpointableVisitor.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLIsBreakpointableVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLTracingEvaluationVisitor.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLTracingEvaluationVisitor.java
index 81d3172..ae02738 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLTracingEvaluationVisitor.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLTracingEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationEnvironment.java
index 1e31ceb..103e9b3 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationStepper.java
index 4b8d5aa..7717c26 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 R.Dvorak 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Radek Dvorak - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationVisitor.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationVisitor.java
index f59318c..c7d61ee 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationVisitor.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationVisitorDecorator.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationVisitorDecorator.java
index a635119..c52db8b 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationVisitorDecorator.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMEvaluationVisitorDecorator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMExecutor.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMExecutor.java
index 361f6ce..b8ba916 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMExecutor.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMModelManager.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMModelManager.java
index eeb5aab..024d54f 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMModelManager.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMModelManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMNestedEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMNestedEvaluationEnvironment.java
index 16458da..4933955 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMNestedEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMNestedEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMRootEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMRootEvaluationEnvironment.java
index 6ac2877..6efd926 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMRootEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMRootEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMVirtualMachine.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMVirtualMachine.java
index d6a4170..83f5cbb 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMVirtualMachine.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/evaluator/OCLVMVirtualMachine.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLDebuggableRunnerFactory.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLDebuggableRunnerFactory.java
index ab08f30..0a105e4 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLDebuggableRunnerFactory.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLDebuggableRunnerFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLInternalDebuggableExecutor.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLInternalDebuggableExecutor.java
index b394dd3..1bb52c3 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLInternalDebuggableExecutor.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLInternalDebuggableExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLLaunchConfigurationDelegate.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLLaunchConfigurationDelegate.java
index d37a761..5818d93 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLLaunchConfigurationDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLLaunchConfigurationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLLaunchConstants.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLLaunchConstants.java
index 6791465..0a0653a 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLLaunchConstants.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLLaunchConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLVMLaunchConfigurationDelegate.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLVMLaunchConfigurationDelegate.java
index ae7b017..e6f9db8 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLVMLaunchConfigurationDelegate.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/launching/OCLVMLaunchConfigurationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/srclookup/OCLSourceLookupDirector.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/srclookup/OCLSourceLookupDirector.java
index 798cc01..39b05d6 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/srclookup/OCLSourceLookupDirector.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/srclookup/OCLSourceLookupDirector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/srclookup/OCLSourcePathComputer.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/srclookup/OCLSourcePathComputer.java
index c77843f..87c4a13 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/srclookup/OCLSourcePathComputer.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/srclookup/OCLSourcePathComputer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     R.Dvorak and others - QVTo debugger framework
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/AbstractStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/AbstractStepper.java
index 8ac3963..d0e298c 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/AbstractStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/AbstractStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/CallExpStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/CallExpStepper.java
index 56b4d09..27da934 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/CallExpStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/CallExpStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/ElementStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/ElementStepper.java
index bde6070..e0b6906 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/ElementStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/ElementStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/ExpressionInOCLStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/ExpressionInOCLStepper.java
index f37bd5a..c29fbd4 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/ExpressionInOCLStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/ExpressionInOCLStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/IfExpStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/IfExpStepper.java
index b89ff9b..092f5dc 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/IfExpStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/IfExpStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/IterateExpStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/IterateExpStepper.java
index 0fd1092..c2c1d01 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/IterateExpStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/IterateExpStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/LetExpStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/LetExpStepper.java
index 7be78bc..8721cc0 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/LetExpStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/LetExpStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/LoopExpStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/LoopExpStepper.java
index e51075b..fd19a09 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/LoopExpStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/LoopExpStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/NonStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/NonStepper.java
index 80741e5..103eebb 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/NonStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/NonStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/OCLStepperVisitor.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/OCLStepperVisitor.java
index fc439c5..7ca5772 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/OCLStepperVisitor.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/OCLStepperVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/OperationCallExpStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/OperationCallExpStepper.java
index 55623bc..ce7f80b 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/OperationCallExpStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/OperationCallExpStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/PostStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/PostStepper.java
index ccad2c7..75d3a7d 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/PostStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/PostStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/PropertyCallExpStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/PropertyCallExpStepper.java
index ed0914a..7a2f3a9 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/PropertyCallExpStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/PropertyCallExpStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/VariableStepper.java b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/VariableStepper.java
index db4adb7..8d8f676 100644
--- a/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/VariableStepper.java
+++ b/examples/org.eclipse.ocl.examples.debug/src/org/eclipse/ocl/examples/debug/stepper/VariableStepper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/about.html b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/about.html
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/build.properties b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/build.properties
index efa1b9b..2974d40 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/build.properties
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/plugin.properties b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/plugin.properties
index fc5fe1b..2dd5ce0 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/AbstractFilterAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/AbstractFilterAction.java
index 4256cb5..5f5d438 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/AbstractFilterAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/AbstractFilterAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/CollapseAllNodesAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/CollapseAllNodesAction.java
index ea1517a..81a4b46 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/CollapseAllNodesAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/CollapseAllNodesAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/DebugValidityAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/DebugValidityAction.java
index 7517d94..2a25799 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/DebugValidityAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/DebugValidityAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/DisableAllUnusedNodesAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/DisableAllUnusedNodesAction.java
index 5bdfe60..471530b 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/DisableAllUnusedNodesAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/DisableAllUnusedNodesAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/EnableDisableAllNodesAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/EnableDisableAllNodesAction.java
index 19c6b9a..99bb4d2 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/EnableDisableAllNodesAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/EnableDisableAllNodesAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ExpandAllNodesAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ExpandAllNodesAction.java
index 40ecf25..e5b80b7 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ExpandAllNodesAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ExpandAllNodesAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ExportValidationResultAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ExportValidationResultAction.java
index c0dbaec..6f5566f 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ExportValidationResultAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ExportValidationResultAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/FilterValidationResultAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/FilterValidationResultAction.java
index d5db8f7..1bc39bd 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/FilterValidationResultAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/FilterValidationResultAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ForceValidityViewRefreshAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ForceValidityViewRefreshAction.java
index 6fb30da..1c8295b 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ForceValidityViewRefreshAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ForceValidityViewRefreshAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/LockValidatableNodesAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/LockValidatableNodesAction.java
index ed33fdc..153586e 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/LockValidatableNodesAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/LockValidatableNodesAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/RunValidityAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/RunValidityAction.java
index 457196e..672bde8 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/RunValidityAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/RunValidityAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ShowElementInEditorAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ShowElementInEditorAction.java
index 9bf1d3c..acbd15e 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ShowElementInEditorAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ShowElementInEditorAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ShowValidityViewHandler.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ShowValidityViewHandler.java
index a08f91e..9803574 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ShowValidityViewHandler.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/ShowValidityViewHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/StopValidityAction.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/StopValidityAction.java
index 34bb375..ae4015d 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/StopValidityAction.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/actions/StopValidityAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/filters/UnusedNodesVisibilityFilter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/filters/UnusedNodesVisibilityFilter.java
index 523b1e0..623c15f 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/filters/UnusedNodesVisibilityFilter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/filters/UnusedNodesVisibilityFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/locator/ConstraintUILocator.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/locator/ConstraintUILocator.java
index 441c62a..6c03472 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/locator/ConstraintUILocator.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/locator/ConstraintUILocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/markers/GoToConstrainingNodeMarker.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/markers/GoToConstrainingNodeMarker.java
index 453a06e..0680bf9 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/markers/GoToConstrainingNodeMarker.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/markers/GoToConstrainingNodeMarker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/markers/GoToValidatableNodeMarker.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/markers/GoToValidatableNodeMarker.java
index a903bcd..0fbbaad 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/markers/GoToValidatableNodeMarker.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/markers/GoToValidatableNodeMarker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/messages/ValidityUIMessages.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/messages/ValidityUIMessages.java
index 6b3b1fd..12c6fb8 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/messages/ValidityUIMessages.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/messages/ValidityUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/messages/ValidityUIMessages.properties b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/messages/ValidityUIMessages.properties
index b79a398..8faf6c2 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/messages/ValidityUIMessages.properties
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/messages/ValidityUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2015 Obeo 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 ###############################################################################
 ValidityView_viewTitle= Validity View
 ValidityView_validatableNodesSectionName = Model Elements
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/plugin/ValidityUIPlugin.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/plugin/ValidityUIPlugin.java
index 0abdc4c..d17b9c1 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/plugin/ValidityUIPlugin.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/plugin/ValidityUIPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/AbstractNodeContentProvider.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/AbstractNodeContentProvider.java
index 3d9c5a0..d15d620 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/AbstractNodeContentProvider.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/AbstractNodeContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/ConstrainingNodeContentProvider.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/ConstrainingNodeContentProvider.java
index 0f516cc..5d86437 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/ConstrainingNodeContentProvider.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/ConstrainingNodeContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/NodeCheckStateProvider.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/NodeCheckStateProvider.java
index 306adc9..19b7db1 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/NodeCheckStateProvider.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/NodeCheckStateProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/NodeLabelProvider.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/NodeLabelProvider.java
index ad61e1a..97113d7 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/NodeLabelProvider.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/NodeLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/ValidatableNodeContentProvider.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/ValidatableNodeContentProvider.java
index d82e699..314bb27 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/ValidatableNodeContentProvider.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/providers/ValidatableNodeContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ContainerContentProvider.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ContainerContentProvider.java
index 1df9cef..bf49553 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ContainerContentProvider.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ContainerContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ContainerSelectionGroup.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ContainerSelectionGroup.java
index 83d4a48..410cc1d 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ContainerSelectionGroup.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ContainerSelectionGroup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/DecoratingColumnLabelProvider.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/DecoratingColumnLabelProvider.java
index a2f8bd6..a834e9b 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/DecoratingColumnLabelProvider.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/DecoratingColumnLabelProvider.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012, 2014 Eclipse contributors 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  */
 package org.eclipse.ocl.examples.emf.validation.validity.ui.ripoffs;
 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/FilteredCheckboxTree.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/FilteredCheckboxTree.java
index c9504de..36f9703 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/FilteredCheckboxTree.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/FilteredCheckboxTree.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ResourceAndContainerGroup.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ResourceAndContainerGroup.java
index 6a94a56..7dde349 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ResourceAndContainerGroup.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/ripoffs/ResourceAndContainerGroup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/FormMessageManager.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/FormMessageManager.java
index 2265ac3..c687974 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/FormMessageManager.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/FormMessageManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/IDEValidityManager.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/IDEValidityManager.java
index def00da..021e965 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/IDEValidityManager.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/IDEValidityManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SelectionUtil.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SelectionUtil.java
index 1ffa443..f974be3 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SelectionUtil.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SelectionUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SeveritiesDecorator.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SeveritiesDecorator.java
index ce59a0f..3c58bb2 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SeveritiesDecorator.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SeveritiesDecorator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SideBySideImageDecorator.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SideBySideImageDecorator.java
index 30e0890..b790788 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SideBySideImageDecorator.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/SideBySideImageDecorator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityNodeCheckStateListener.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityNodeCheckStateListener.java
index 98c753c..b200a07 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityNodeCheckStateListener.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityNodeCheckStateListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityView.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityView.java
index d6de8ac..71b050c 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityView.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityViewRefreshJob.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityViewRefreshJob.java
index 4364293..a94077c 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityViewRefreshJob.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/view/ValidityViewRefreshJob.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizard.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizard.java
index d23d09a..46ba47f 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizard.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizardPage.java b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizardPage.java
index cb9b257..70fd62c 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizardPage.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity.ui/src/org/eclipse/ocl/examples/emf/validation/validity/ui/wizards/ExportValidationResultsFileWizardPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/about.html b/examples/org.eclipse.ocl.examples.emf.validation.validity/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/about.html
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/build.properties b/examples/org.eclipse.ocl.examples.emf.validation.validity/build.properties
index 1f4c4a1..8fd32e4 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/build.properties
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/AbstractNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/AbstractNode.java
index 7b2ff2d..cc45b71 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/AbstractNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/AbstractNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ConstrainingNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ConstrainingNode.java
index d0d8567..6c85f94 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ConstrainingNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ConstrainingNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/LeafConstrainingNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/LeafConstrainingNode.java
index c91f96c..a01da4a 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/LeafConstrainingNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/LeafConstrainingNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/Result.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/Result.java
index f857542..c01621e 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/Result.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/Result.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultConstrainingNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultConstrainingNode.java
index c1eacfc..b27fecf 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultConstrainingNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultConstrainingNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultSet.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultSet.java
index ba54ad3..cd42870 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultSet.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultValidatableNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultValidatableNode.java
index 7020e1a..46fb3b3 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultValidatableNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ResultValidatableNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootConstrainingNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootConstrainingNode.java
index 17e9e4b..8c7f18e 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootConstrainingNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootConstrainingNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootNode.java
index ea41746..49def75 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootValidatableNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootValidatableNode.java
index 6ace7bb..a1a837b 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootValidatableNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/RootValidatableNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/Severity.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/Severity.java
index a888498..8e14669 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/Severity.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/Severity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidatableNode.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidatableNode.java
index 553d1da..207fee3 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidatableNode.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidatableNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidityFactory.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidityFactory.java
index efa3c76..3176223 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidityFactory.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidityFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidityPackage.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidityPackage.java
index 36c2f01..292ad42 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidityPackage.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/ValidityPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/AbstractNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/AbstractNodeImpl.java
index e80a76d..bb2ed9e 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/AbstractNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/AbstractNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ConstrainingNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ConstrainingNodeImpl.java
index 81c2d6c..5fcdcb9 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ConstrainingNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ConstrainingNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/LeafConstrainingNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/LeafConstrainingNodeImpl.java
index e3190b4..09a2240 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/LeafConstrainingNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/LeafConstrainingNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultConstrainingNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultConstrainingNodeImpl.java
index 8f25235..41a091d 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultConstrainingNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultConstrainingNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultImpl.java
index 8be6b98..1601274 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultSetImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultSetImpl.java
index ec60001..1bb36c5 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultSetImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultSetImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultValidatableNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultValidatableNodeImpl.java
index 9fa5ae1..734e341 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultValidatableNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ResultValidatableNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootConstrainingNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootConstrainingNodeImpl.java
index 21e6334..95bc632 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootConstrainingNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootConstrainingNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootNodeImpl.java
index fca38ff..a3ab29f 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootValidatableNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootValidatableNodeImpl.java
index 406381d..4c26566 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootValidatableNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/RootValidatableNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidatableNodeImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidatableNodeImpl.java
index d605d4e..0a2ebf5 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidatableNodeImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidatableNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidityFactoryImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidityFactoryImpl.java
index 798d55b..bdd9fe8 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidityFactoryImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidityFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidityPackageImpl.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidityPackageImpl.java
index f056464..409674b 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidityPackageImpl.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/impl/ValidityPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValidityAdapterFactory.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValidityAdapterFactory.java
index 224b384..9148e12 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValidityAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValidityAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValiditySwitch.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValiditySwitch.java
index 6d972d2..ef3c276 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValiditySwitch.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/emf-gen/org/eclipse/ocl/examples/emf/validation/validity/util/ValiditySwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/plugin.properties b/examples/org.eclipse.ocl.examples.emf.validation.validity/plugin.properties
index 44975ae..087e5b0 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/AbstractExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/AbstractExporter.java
index fa85129..e1a6476 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/AbstractExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/AbstractExporter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/HTMLExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/HTMLExporter.java
index f421666..97e4ca8 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/HTMLExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/HTMLExporter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporter.java
index 4ee6886..c5b007a 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporterDescriptor.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporterDescriptor.java
index f5315ac..5f1a2b7 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporterDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/IValidityExporterDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ModelExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ModelExporter.java
index 6d6b872..63fefd2 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ModelExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ModelExporter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/TextExporter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/TextExporter.java
index 157bc8a..7841fbe 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/TextExporter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/TextExporter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterDescriptor.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterDescriptor.java
index 450db18..c1b2986 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterDescriptor.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterListener.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterListener.java
index 0b09b7a..f1cd077 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterListener.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterRegistry.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterRegistry.java
index a14dcb3..8c800ae 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterRegistry.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/export/ValidityExporterRegistry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/AbstractConstraintLocator.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/AbstractConstraintLocator.java
index 5ad3397..7a08e34 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/AbstractConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/AbstractConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/ConstraintLocator.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/ConstraintLocator.java
index 9ab45e5..a5f6b43 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/ConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/ConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EClassConstraintLocator.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EClassConstraintLocator.java
index 9687c12..22a5785 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EClassConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EClassConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EClassifierConstraintLocator.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EClassifierConstraintLocator.java
index c9f3d28..7a34467 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EClassifierConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EClassifierConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EValidatorConstraintLocator.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EValidatorConstraintLocator.java
index 779e24d..d3f34d9 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EValidatorConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/locator/EValidatorConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ConstrainingURI.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ConstrainingURI.java
index 3c09d0d..94e74cf 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ConstrainingURI.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ConstrainingURI.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/MonitorStep.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/MonitorStep.java
index d39dfb9..f990d30 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/MonitorStep.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/MonitorStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/TypeURI.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/TypeURI.java
index 146d9d3..67f1f2e 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/TypeURI.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/TypeURI.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidatableURI.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidatableURI.java
index 4128a75..f630cb0 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidatableURI.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidatableURI.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityManager.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityManager.java
index ece1443..1271296 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityManager.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityModel.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityModel.java
index 06a13e6..b65dc1e 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityModel.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/manager/ValidityModel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/messages/ValidityMessages.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/messages/ValidityMessages.java
index 201b50f..ed00d3c 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/messages/ValidityMessages.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/messages/ValidityMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/messages/ValidityMessages.properties b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/messages/ValidityMessages.properties
index de84f4a..0380aeb 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/messages/ValidityMessages.properties
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/messages/ValidityMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2015 Obeo 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 ###############################################################################
 ValidityView_Constraints_LabelProvider_NonExistentResource = The Resource of this constraint is not available in the current workspace
 ValidityView_Constraints_LabelProvider_ExpressionNotAvailable = The Expression of this constraint is not available
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/plugin/ConstraintLocatorRegistryReader.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/plugin/ConstraintLocatorRegistryReader.java
index a24fcb3..115472a 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/plugin/ConstraintLocatorRegistryReader.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/plugin/ConstraintLocatorRegistryReader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/plugin/ValidityPlugin.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/plugin/ValidityPlugin.java
index 92ec7c1..1512ae3 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/plugin/ValidityPlugin.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/plugin/ValidityPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/IVisibilityFilter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/IVisibilityFilter.java
index 2a4784a..81d31dd 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/IVisibilityFilter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/IVisibilityFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/SeveritiesVisibilityFilter.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/SeveritiesVisibilityFilter.java
index ede748d..4d3a95d 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/SeveritiesVisibilityFilter.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/SeveritiesVisibilityFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	 Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/ValidityUtils.java b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/ValidityUtils.java
index 834fe57..3377e34 100644
--- a/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/ValidityUtils.java
+++ b/examples/org.eclipse.ocl.examples.emf.validation.validity/src/org/eclipse/ocl/examples/emf/validation/validity/utilities/ValidityUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/about.html b/examples/org.eclipse.ocl.examples.eventmanager/about.html
index e02cb11..a22e307 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/about.html
+++ b/examples/org.eclipse.ocl.examples.eventmanager/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.ocl.examples.eventmanager/build.properties b/examples/org.eclipse.ocl.examples.eventmanager/build.properties
index 51c9be8..3334a8e 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/build.properties
+++ b/examples/org.eclipse.ocl.examples.eventmanager/build.properties
@@ -1,9 +1,9 @@
 ###########################################################################
 # Copyright (c) 2009, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/plugin.properties b/examples/org.eclipse.ocl.examples.eventmanager/plugin.properties
index 42a0f9a..285a505 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.eventmanager/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/CompositeIterable.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/CompositeIterable.java
index d7c828e..b6ba5b4 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/CompositeIterable.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/CompositeIterable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventFilter.java
index 066ce57..f6475d7 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManager.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManager.java
index c795699..a628b6f 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManager.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManagerFactory.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManagerFactory.java
index 31bc64f..90f3f4c 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManagerFactory.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/EventManagerFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/NotificationHelper.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/NotificationHelper.java
index ab0a341..bbd68d7 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/NotificationHelper.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/NotificationHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AbstractEventFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AbstractEventFilter.java
index 8456102..c42e434 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AbstractEventFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AbstractEventFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AndFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AndFilter.java
index 599551b..d6ea30c 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AndFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/AndFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ClassFilter.java
index 0d20bfa..eaa7468 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ClassFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ClassFilterIncludingSubclasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ClassFilterIncludingSubclasses.java
index ab10e30..df9c999 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ClassFilterIncludingSubclasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ClassFilterIncludingSubclasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ContainmentFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ContainmentFilter.java
index c2a2ebc..a90b8a9 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ContainmentFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/ContainmentFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/EventTypeFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/EventTypeFilter.java
index 509193e..067ef82 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/EventTypeFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/EventTypeFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/LogicalOperationFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/LogicalOperationFilter.java
index 592ccdd..f5e3588 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/LogicalOperationFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/LogicalOperationFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilter.java
index 5fb55a4..6393922 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilterIncludingSubclasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilterIncludingSubclasses.java
index 561399a..fc349fc 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilterIncludingSubclasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NewValueClassFilterIncludingSubclasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NotFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NotFilter.java
index ba5dd9b..f433d66 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NotFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/NotFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilter.java
index 60bfe91..653d6c1 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilterIncludingSubclasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilterIncludingSubclasses.java
index fa99c91..30df49a 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilterIncludingSubclasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OldValueClassFilterIncludingSubclasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OrFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OrFilter.java
index 538b480..30bfdf7 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OrFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/OrFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/StructuralFeatureFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/StructuralFeatureFilter.java
index 5e92395..2566d23 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/StructuralFeatureFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/filters/StructuralFeatureFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/AdapterCapsule.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/AdapterCapsule.java
index d4b280d..fc17570 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/AdapterCapsule.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/AdapterCapsule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/CleanupThread.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/CleanupThread.java
index e9e871d..5fa12b0 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/CleanupThread.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/CleanupThread.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/DeferringNotifier.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/DeferringNotifier.java
index 94e2da2..2ff6647 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/DeferringNotifier.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/DeferringNotifier.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventAdapter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventAdapter.java
index b0be791..01bdb49 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventAdapter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventManagerFactoryImpl.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventManagerFactoryImpl.java
index d96e068..6caefe6 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventManagerFactoryImpl.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventManagerFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventManagerTableBased.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventManagerTableBased.java
index 1f59cb8..8437c7e 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventManagerTableBased.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/EventManagerTableBased.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/FilterTableEntry.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/FilterTableEntry.java
index 1ea7a6f..874f65a 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/FilterTableEntry.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/FilterTableEntry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/ListenerTypeEnum.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/ListenerTypeEnum.java
index 36a82a1..2b0fe2d 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/ListenerTypeEnum.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/ListenerTypeEnum.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/LogicalOperationFilterImpl.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/LogicalOperationFilterImpl.java
index 67f016b..e6f9d76 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/LogicalOperationFilterImpl.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/LogicalOperationFilterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/Registration.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/Registration.java
index de5b332..4c1e02c 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/Registration.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/Registration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationManagerTableBased.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationManagerTableBased.java
index f612ede..63b54c4 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationManagerTableBased.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationManagerTableBased.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationSet.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationSet.java
index c659582..e66cb04 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationSet.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/RegistrationSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForClassFilter.java
index 55b1fab..c1820cc 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForClassFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForClassFilterIncludingSubClasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForClassFilterIncludingSubClasses.java
index 1956b21..804a403 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForClassFilterIncludingSubClasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForClassFilterIncludingSubClasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForContainmentFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForContainmentFilter.java
index 6e50b1e..354c331 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForContainmentFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForContainmentFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventFilter.java
index d70012d..7a8eacc 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009-2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventTypeFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventTypeFilter.java
index 6d4c3a7..17a4c7f 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventTypeFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForEventTypeFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilter.java
index 56cf098..b3c5f74 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilterIncludingSubclasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilterIncludingSubclasses.java
index c8104a6..1a7463a 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilterIncludingSubclasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForNewValueClassFilterIncludingSubclasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilter.java
index 7c90e1b..ba39997 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilterIncludingSubclasses.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilterIncludingSubclasses.java
index 0fbdac9..8f67c7e 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilterIncludingSubclasses.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForOldValueClassFilterIncludingSubclasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForStructuralFeatureFilter.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForStructuralFeatureFilter.java
index a892a06..04ec338 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForStructuralFeatureFilter.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/TableForStructuralFeatureFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/VetoException.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/VetoException.java
index 6f4b506..0503064 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/VetoException.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/VetoException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/package-info.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/package-info.java
index d0f940a..8830a0b 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/package-info.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/framework/package-info.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/Bag.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/Bag.java
index c6ef15d..09934ea 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/Bag.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/Bag.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/BagImpl.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/BagImpl.java
index 8f72742..16adead 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/BagImpl.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/BagImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeBag.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeBag.java
index 3a84140..ef20c5e 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeBag.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeBag.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeCollection.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeCollection.java
index 0072bae..6a9529b 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeCollection.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeCollection.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeSet.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeSet.java
index e2fb794..d32bfe8 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeSet.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/CompositeSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/EmptyBag.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/EmptyBag.java
index 96ada9b..c6c98b5 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/EmptyBag.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/EmptyBag.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/SingleSetAsBag.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/SingleSetAsBag.java
index f7f0b46..4df5521 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/SingleSetAsBag.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/SingleSetAsBag.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/Statistics.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/Statistics.java
index 69dd0a7..cdaba7f 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/Statistics.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/Statistics.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/StatisticsImpl.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/StatisticsImpl.java
index c393880..4f57b73 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/StatisticsImpl.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/StatisticsImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/StatisticsStub.java b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/StatisticsStub.java
index 42cb844..a347de6 100644
--- a/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/StatisticsStub.java
+++ b/examples/org.eclipse.ocl.examples.eventmanager/src/org/eclipse/ocl/examples/eventmanager/util/StatisticsStub.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/about.html b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/about.html
index e02cb11..a22e307 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/about.html
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.ocl.examples.impactanalyzer.ui/build.properties b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/build.properties
index 7c1dde2..4ee0800 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/build.properties
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/build.properties
@@ -1,9 +1,9 @@
 ###########################################################################
 # Copyright (c) 2009, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/plugin.properties b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/plugin.properties
index 539eb32..39627f6 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/RevalidateAction.java b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/RevalidateAction.java
index ee2a37a..dcd0c41 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/RevalidateAction.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/RevalidateAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/Revalidator.java b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/Revalidator.java
index 7308dc3..9b76d0c 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/Revalidator.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/src/org/eclipse/ocl/examples/impactanalyzer/editor/Revalidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/about.html b/examples/org.eclipse.ocl.examples.impactanalyzer.util/about.html
index 88a3913..3730be5 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/about.html
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.ocl.examples.impactanalyzer.util/build.properties b/examples/org.eclipse.ocl.examples.impactanalyzer.util/build.properties
index 7c1dde2..4ee0800 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/build.properties
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/build.properties
@@ -1,9 +1,9 @@
 ###########################################################################
 # Copyright (c) 2009, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/plugin.properties b/examples/org.eclipse.ocl.examples.impactanalyzer.util/plugin.properties
index 72b62e8..f6c8d18 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEnvironmentFactoryWithScopedExtentMap.java b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEnvironmentFactoryWithScopedExtentMap.java
index b2011c7..4aa21fc 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEnvironmentFactoryWithScopedExtentMap.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEnvironmentFactoryWithScopedExtentMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEvaluationEnvironmentWithScopedExtentMap.java b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEvaluationEnvironmentWithScopedExtentMap.java
index 2ff0242..62c162f 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEvaluationEnvironmentWithScopedExtentMap.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/EcoreEvaluationEnvironmentWithScopedExtentMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCL.java b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCL.java
index d59b72f..88a0b10 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCL.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCLFactory.java b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCLFactory.java
index 686da21..5e5449a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCLFactory.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OCLFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OclHelper.java b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OclHelper.java
index a775187..1a9d029 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OclHelper.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.util/src/org/eclipse/ocl/examples/impactanalyzer/util/OclHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/about.html b/examples/org.eclipse.ocl.examples.impactanalyzer/about.html
index e02cb11..a22e307 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/about.html
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.ocl.examples.impactanalyzer/build.properties b/examples/org.eclipse.ocl.examples.impactanalyzer/build.properties
index 51c9be8..3334a8e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/build.properties
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/build.properties
@@ -1,9 +1,9 @@
 ###########################################################################
 # Copyright (c) 2009, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/plugin.properties b/examples/org.eclipse.ocl.examples.impactanalyzer/plugin.properties
index 239d4fd..7705139 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/DerivedPropertyNotifier.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/DerivedPropertyNotifier.java
index 820085e..5a894d5 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/DerivedPropertyNotifier.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/DerivedPropertyNotifier.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzer.java
index 7981250..a64cca8 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzerFactory.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzerFactory.java
index dcf8970..867c840 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzerFactory.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ImpactAnalyzerFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/PartialEvaluator.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/PartialEvaluator.java
index 9388ce5..bb50553 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/PartialEvaluator.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/PartialEvaluator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/PartialEvaluatorFactory.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/PartialEvaluatorFactory.java
index 42f5e08..3b97f46 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/PartialEvaluatorFactory.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/PartialEvaluatorFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/Revalidator.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/Revalidator.java
index 7003e68..f4deb9f 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/Revalidator.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/Revalidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ValueNotFoundException.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ValueNotFoundException.java
index 2df5521..0598753 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ValueNotFoundException.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/ValueNotFoundException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/ActivationOption.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/ActivationOption.java
index ac3d6f5..f46d7f3 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/ActivationOption.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/ActivationOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/OptimizationActivation.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/OptimizationActivation.java
index af23bfd..a069597 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/OptimizationActivation.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/configuration/OptimizationActivation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategy.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategy.java
index c9237c7..c98c8dc 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategy.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategyWithTargetExpression.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategyWithTargetExpression.java
index 9b813bb..b6b5667 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategyWithTargetExpression.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategyWithTargetExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategyWithTargetExpressionAndPartialEvaluator.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategyWithTargetExpressionAndPartialEvaluator.java
index 3fa859d..ace3c32 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategyWithTargetExpressionAndPartialEvaluator.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/DeltaPropagationStrategyWithTargetExpressionAndPartialEvaluator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/IdentityPropagationStrategy.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/IdentityPropagationStrategy.java
index 6175cf4..73cb18d 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/IdentityPropagationStrategy.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/IdentityPropagationStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/IteratorSourcePropagationStrategy.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/IteratorSourcePropagationStrategy.java
index 7c2c0e7..f4ecf76 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/IteratorSourcePropagationStrategy.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/IteratorSourcePropagationStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/OperationBodyPropagationStrategy.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/OperationBodyPropagationStrategy.java
index 2898df3..5d4658e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/OperationBodyPropagationStrategy.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/OperationBodyPropagationStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEcoreEnvironmentFactory.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEcoreEnvironmentFactory.java
index e4fae8e..535a766 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEcoreEnvironmentFactory.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEcoreEnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEcoreEvaluationEnvironment.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEcoreEvaluationEnvironment.java
index b70fdcd..99d470e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEcoreEvaluationEnvironment.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEcoreEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluationVisitorImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluationVisitorImpl.java
index 065a3fc..9598981 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluationVisitorImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluationVisitorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorFactoryImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorFactoryImpl.java
index 546035f..4a26360 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorFactoryImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorImpl.java
index a14f10a..e531fb8 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/PartialEvaluatorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/VariableValueNotFoundInfo.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/VariableValueNotFoundInfo.java
index 47f7621..032dee3 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/VariableValueNotFoundInfo.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/VariableValueNotFoundInfo.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/VariableValueNotFoundInfoImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/VariableValueNotFoundInfoImpl.java
index 65b1221..6852842 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/VariableValueNotFoundInfoImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/deltaPropagation/VariableValueNotFoundInfoImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/filterSynthesis/FilterSynthesisImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/filterSynthesis/FilterSynthesisImpl.java
index b4c68c2..832e6bc 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/filterSynthesis/FilterSynthesisImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/filterSynthesis/FilterSynthesisImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ContextTypeRetriever.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ContextTypeRetriever.java
index 8793d41..619c5e7 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ContextTypeRetriever.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ContextTypeRetriever.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/DerivedPropertyNotifierImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/DerivedPropertyNotifierImpl.java
index 0cfaa6f..0ed0e8a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/DerivedPropertyNotifierImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/DerivedPropertyNotifierImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerFactoryImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerFactoryImpl.java
index 0a2c76f..f99614d 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerFactoryImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerImpl.java
index bff082f..6e2709c 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerPlugin.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerPlugin.java
index f587a8f..64bf3aa 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerPlugin.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/ImpactAnalyzerPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/OperationBodyToCallMapper.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/OperationBodyToCallMapper.java
index cf8e45d..d3bb531 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/OperationBodyToCallMapper.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/impl/OperationBodyToCallMapper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbsoluteNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbsoluteNavigationStep.java
index 39e4b79..2718b3a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbsoluteNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbsoluteNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractNavigationStep.java
index 83f7144..244e720 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractPathCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractPathCache.java
index 7437f45..278479e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractPathCache.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractPathCache.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractTracer.java
index 75c4e1c..fc436dd 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AbstractTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AllInstancesNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AllInstancesNavigationStep.java
index 79d7fb5..f974bc2 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AllInstancesNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AllInstancesNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AllSubclassesFinder.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AllSubclassesFinder.java
index 0c14176..40215fc 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AllSubclassesFinder.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AllSubclassesFinder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AlwaysEmptyChangeListener.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AlwaysEmptyChangeListener.java
index ae48134..d0110ae 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AlwaysEmptyChangeListener.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AlwaysEmptyChangeListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AssociationNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AssociationNavigationStep.java
index 96be232..332130f 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AssociationNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/AssociationNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BooleanLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BooleanLiteralExpTracer.java
index da71387..2a62942 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BooleanLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BooleanLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BranchingNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BranchingNavigationStep.java
index 101377e..0aca727 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BranchingNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/BranchingNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/CollectionLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/CollectionLiteralExpTracer.java
index b8e700e..173f3e0 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/CollectionLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/CollectionLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/CompositeNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/CompositeNavigationStep.java
index 80f50f2..24d1d04 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/CompositeNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/CompositeNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/EmptyResultNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/EmptyResultNavigationStep.java
index 2a0fe0b..af08eda 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/EmptyResultNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/EmptyResultNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/EnumLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/EnumLiteralExpTracer.java
index 9055b2b..5da4a8d 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/EnumLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/EnumLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/HashCodeChangeListener.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/HashCodeChangeListener.java
index c763218..acd00b5 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/HashCodeChangeListener.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/HashCodeChangeListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IdentityNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IdentityNavigationStep.java
index c433dd6..6f1e06b 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IdentityNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IdentityNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IfExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IfExpTracer.java
index 19eeb8c..b8f5781 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IfExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IfExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IndirectingStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IndirectingStep.java
index fde99d3..d78bb25 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IndirectingStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IndirectingStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InstanceScopeAnalysis.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InstanceScopeAnalysis.java
index 8ccbf96..d1fa0df 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InstanceScopeAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InstanceScopeAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IntegerLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IntegerLiteralExpTracer.java
index b6705c8..e021694 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IntegerLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IntegerLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InvalidlLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InvalidlLiteralExpTracer.java
index 402b3a9..e03907e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InvalidlLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/InvalidlLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IterateExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IterateExpTracer.java
index 79250f0..3d19ac6 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IterateExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IterateExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IteratorExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IteratorExpTracer.java
index 5da3557..e237a3e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IteratorExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/IteratorExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/LetExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/LetExpTracer.java
index c42aa67..e232a55 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/LetExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/LetExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStep.java
index 5f5dec2..5265a98 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStepSequence.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStepSequence.java
index a62745b..6014a8a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStepSequence.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NavigationStepSequence.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NullLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NullLiteralExpTracer.java
index b01f5ad..cb4664b 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NullLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/NullLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OperationCallExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OperationCallExpTracer.java
index b074802..6ecfba0 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OperationCallExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OperationCallExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OppositePropertyCallExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OppositePropertyCallExpTracer.java
index e5b2a5c..ae10120 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OppositePropertyCallExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OppositePropertyCallExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OppositePropertyNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OppositePropertyNavigationStep.java
index 353f944..60d4b4e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OppositePropertyNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/OppositePropertyNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PathCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PathCache.java
index 7f4a654..54b5690 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PathCache.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PathCache.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PredicateCheckNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PredicateCheckNavigationStep.java
index 261dd33..debf2a4 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PredicateCheckNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PredicateCheckNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PropertyCallExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PropertyCallExpTracer.java
index bfa270f..271c507 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PropertyCallExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/PropertyCallExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/RealLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/RealLiteralExpTracer.java
index 88abc66..1e0a0e5 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/RealLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/RealLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/RefImmediateCompositeNavigationStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/RefImmediateCompositeNavigationStep.java
index f527706..f5d55f4 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/RefImmediateCompositeNavigationStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/RefImmediateCompositeNavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/SourceTypeChangeListener.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/SourceTypeChangeListener.java
index 69ada72..8424a88 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/SourceTypeChangeListener.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/SourceTypeChangeListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/StringLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/StringLiteralExpTracer.java
index b6f9458..b5f24bf 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/StringLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/StringLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TargetTypeChangeListener.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TargetTypeChangeListener.java
index 7ce6836..7e963dc 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TargetTypeChangeListener.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TargetTypeChangeListener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TracebackCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TracebackCache.java
index 0947176..f5bc6fe 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TracebackCache.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TracebackCache.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/Tracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/Tracer.java
index 1028b8f..827214f 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/Tracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/Tracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TupleLiteralExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TupleLiteralExpTracer.java
index 4b57627..4bea786 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TupleLiteralExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TupleLiteralExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TypeExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TypeExpTracer.java
index b50f0f9..d007af7 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TypeExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/TypeExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/VariableExpTracer.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/VariableExpTracer.java
index 45b62d3..10abaae 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/VariableExpTracer.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/VariableExpTracer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/debug/NavigationStepDebugHelper.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/debug/NavigationStepDebugHelper.java
index 0326d49..35ec04a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/debug/NavigationStepDebugHelper.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/debug/NavigationStepDebugHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/debug/NavigationStepDebugHelperExtension.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/debug/NavigationStepDebugHelperExtension.java
index 87f9425..283cb77 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/debug/NavigationStepDebugHelperExtension.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/debug/NavigationStepDebugHelperExtension.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/AbstractTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/AbstractTracebackStep.java
index fb85634..44ef206 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/AbstractTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/AbstractTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/BranchingTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/BranchingTracebackStep.java
index 9043fad..15a1c86 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/BranchingTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/BranchingTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/CollectionLiteralTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/CollectionLiteralTracebackStep.java
index b1ea60f..5716384 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/CollectionLiteralTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/CollectionLiteralTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/EmptyTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/EmptyTracebackStep.java
index 41c881a..b3e098a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/EmptyTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/EmptyTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IfTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IfTracebackStep.java
index 83848dd..79ddd45 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IfTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IfTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IterateTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IterateTracebackStep.java
index de8cb81..e66df07 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IterateTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IterateTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IteratorTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IteratorTracebackStep.java
index b0781cb..0c4c073 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IteratorTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/IteratorTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/LetTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/LetTracebackStep.java
index 923d40e..f1e87b7 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/LetTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/LetTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/OperationCallTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/OperationCallTracebackStep.java
index 9223a19..6e85ea1 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/OperationCallTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/OperationCallTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/OppositePropertyCallTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/OppositePropertyCallTracebackStep.java
index 0e59eee..623bc20 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/OppositePropertyCallTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/OppositePropertyCallTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/PropertyCallTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/PropertyCallTracebackStep.java
index 34dd70f..59c3bd0 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/PropertyCallTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/PropertyCallTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackCache.java
index c7b4d8e..a2ce4ab 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackCache.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackCache.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStep.java
index a0ddb1a..755a2df 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStepCache.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStepCache.java
index f7c208b..f0983ed 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStepCache.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TracebackStepCache.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TupleLiteralTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TupleLiteralTracebackStep.java
index c3645fd..ff8357a 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TupleLiteralTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/TupleLiteralTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/VariableTracebackStep.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/VariableTracebackStep.java
index c408b5c..dcea19e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/VariableTracebackStep.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/traceback/VariableTracebackStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/AbstractUnusedEvaluationRequestValue.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/AbstractUnusedEvaluationRequestValue.java
index 77bc4ee..848da9f 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/AbstractUnusedEvaluationRequestValue.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/AbstractUnusedEvaluationRequestValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/FindAlwaysUsedVariablesVisitor.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/FindAlwaysUsedVariablesVisitor.java
index ef4690c..d6e46d7 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/FindAlwaysUsedVariablesVisitor.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/FindAlwaysUsedVariablesVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/NoAllInstancesDuringEvaluationForUnusedCheck.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/NoAllInstancesDuringEvaluationForUnusedCheck.java
index 0b75d2b..a4b5335 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/NoAllInstancesDuringEvaluationForUnusedCheck.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/NoAllInstancesDuringEvaluationForUnusedCheck.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEcoreEnvironmentFactoryNoAllInstances.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEcoreEnvironmentFactoryNoAllInstances.java
index 6a206ef..5eb3939 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEcoreEnvironmentFactoryNoAllInstances.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEcoreEnvironmentFactoryNoAllInstances.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEvaluationVisitorImplNoAllInstances.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEvaluationVisitorImplNoAllInstances.java
index 14eb37f..9112f77 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEvaluationVisitorImplNoAllInstances.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEvaluationVisitorImplNoAllInstances.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEvaluatorNoAllInstances.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEvaluatorNoAllInstances.java
index ea02a9c..a4d8925 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEvaluatorNoAllInstances.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/PartialEvaluatorNoAllInstances.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequest.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequest.java
index fd10ce8..6168b05 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequest.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestFactory.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestFactory.java
index fb0b7ff..bbd1af5 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestFactory.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestSet.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestSet.java
index 99a4041..296c1ab 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestSet.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestValue.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestValue.java
index 07a6c80..39955b7 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestValue.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/instanceScope/unusedEvaluation/UnusedEvaluationRequestValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/AnnotatedEObject.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/AnnotatedEObject.java
index 24280b3..9f415e4 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/AnnotatedEObject.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/AnnotatedEObject.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/EntryIterableWithIterableForNullKey.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/EntryIterableWithIterableForNullKey.java
index 90feeb4..4627542 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/EntryIterableWithIterableForNullKey.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/EntryIterableWithIterableForNullKey.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/FlatSet.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/FlatSet.java
index 08933de..0e64f83 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/FlatSet.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/FlatSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/HighlightingToStringVisitor.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/HighlightingToStringVisitor.java
index 43d4de6..479157e 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/HighlightingToStringVisitor.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/HighlightingToStringVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/IterableAsOperationCallExpKeyedSet.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/IterableAsOperationCallExpKeyedSet.java
index 8d8c33d..c7548ec 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/IterableAsOperationCallExpKeyedSet.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/IterableAsOperationCallExpKeyedSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSet.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSet.java
index 437358b..e90a2f4 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSet.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSetFactory.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSetFactory.java
index 0ea11c0..32f0d53 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSetFactory.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSetFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSetImpl.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSetImpl.java
index 642dab1..4bd5800 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSetImpl.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/OperationCallExpKeyedSetImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/SemanticComparable.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/SemanticComparable.java
index 343e2a8..cf3e929 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/SemanticComparable.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/SemanticComparable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/SemanticIdentity.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/SemanticIdentity.java
index feed0ee..679dcda 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/SemanticIdentity.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/SemanticIdentity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/Tuple.java b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/Tuple.java
index 9c63444..15548e0 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/Tuple.java
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/src/org/eclipse/ocl/examples/impactanalyzer/util/Tuple.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/about.html b/examples/org.eclipse.ocl.examples.interpreter/about.html
index c0be2e9..e9d1dac 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/about.html
+++ b/examples/org.eclipse.ocl.examples.interpreter/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.ocl.examples.interpreter/build.properties b/examples/org.eclipse.ocl.examples.interpreter/build.properties
index bf397c6..b9f2322 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/build.properties
+++ b/examples/org.eclipse.ocl.examples.interpreter/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/plugin.properties b/examples/org.eclipse.ocl.examples.interpreter/plugin.properties
index 1b1d214..4c1cfc1 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.interpreter/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005-2012 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/plugin.xml b/examples/org.eclipse.ocl.examples.interpreter/plugin.xml
index c558241..9d83a63 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/plugin.xml
+++ b/examples/org.eclipse.ocl.examples.interpreter/plugin.xml
@@ -4,9 +4,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/OCLExamplePlugin.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/OCLExamplePlugin.java
index 2e118c6..fd35e20 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/OCLExamplePlugin.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/OCLExamplePlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleDelegate.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleDelegate.java
index 60b3934..7ca939d 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleDelegate.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleHandler.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleHandler.java
index 08ef9b5..9157325 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleHandler.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowConsoleHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleDelegate.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleDelegate.java
index 212d101..fdbe07f 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleDelegate.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleHandler.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleHandler.java
index 5d21f2e..a09ba3d 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleHandler.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowEcoreConsoleHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleDelegate.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleDelegate.java
index 2075df0..84327b0 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleDelegate.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleHandler.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleHandler.java
index 21f2829..687a320 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleHandler.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/actions/ShowUMLConsoleHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/DelegatingPackageRegistry.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/DelegatingPackageRegistry.java
index 3fbbe21..10488dc 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/DelegatingPackageRegistry.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/DelegatingPackageRegistry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/IOCLFactory.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/IOCLFactory.java
index 026d59e..1201aec 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/IOCLFactory.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/IOCLFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/ModelingLevel.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/ModelingLevel.java
index 3c2b220..a3a55b0 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/ModelingLevel.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/ModelingLevel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsole.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsole.java
index 0024edb..d560f22 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsole.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsole.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsoleFactory.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsoleFactory.java
index cb7f26f..819186c 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsoleFactory.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsoleFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsolePage.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsolePage.java
index 7ef165c..b45960d 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsolePage.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLConsolePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLResource.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLResource.java
index 1076bc8..2df1534 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLResource.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/OCLResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/TargetMetamodel.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/TargetMetamodel.java
index 2c7f7f0..fb93169 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/TargetMetamodel.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/TargetMetamodel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/ColorManager.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/ColorManager.java
index 104b095..b04df70 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/ColorManager.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/ColorManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCollectionTupleRule.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCollectionTupleRule.java
index ffe7600..a75356e 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCollectionTupleRule.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCollectionTupleRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCommentScanner.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCommentScanner.java
index 90e3610..b8ef16b 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCommentScanner.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCommentScanner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCompletionProcessor.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCompletionProcessor.java
index 06bc345..de46c84 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCompletionProcessor.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLCompletionProcessor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLConfiguration.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLConfiguration.java
index c108772..3f1fd36 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLConfiguration.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLConfiguration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLDocument.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLDocument.java
index 63cc747..e63b4c5 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLDocument.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLDocument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLIdentifierRule.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLIdentifierRule.java
index 0313e8c..c0138d7 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLIdentifierRule.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLIdentifierRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLKeywordRule.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLKeywordRule.java
index f66e315..9480a8b 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLKeywordRule.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLKeywordRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLPartitionScanner.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLPartitionScanner.java
index ec096f6..5416ef9 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLPartitionScanner.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLPartitionScanner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLScanner.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLScanner.java
index 06a1d77..c5e3ef6 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLScanner.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLScanner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLSourceViewer.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLSourceViewer.java
index 59efc44..83a7eec 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLSourceViewer.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLSourceViewer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLWhitespaceDetector.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLWhitespaceDetector.java
index 2e6a069..dee96a3 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLWhitespaceDetector.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/console/text/OCLWhitespaceDetector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/internal/l10n/OCLInterpreterMessages.java b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/internal/l10n/OCLInterpreterMessages.java
index 3a88336..a58cd86 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/internal/l10n/OCLInterpreterMessages.java
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/internal/l10n/OCLInterpreterMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/internal/l10n/OCLInterpreterMessages.properties b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/internal/l10n/OCLInterpreterMessages.properties
index 751ee9b..95464ae 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/internal/l10n/OCLInterpreterMessages.properties
+++ b/examples/org.eclipse.ocl.examples.interpreter/src/org/eclipse/ocl/examples/interpreter/internal/l10n/OCLInterpreterMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/about.html b/examples/org.eclipse.ocl.examples.project.completeocltutorial/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/about.html
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/build.properties b/examples/org.eclipse.ocl.examples.project.completeocltutorial/build.properties
index 725c9dc..dd4bc2d 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/build.properties
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/EcoreTestFile.ecore b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/EcoreTestFile.ecore
index 0698fd0..03ed099 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/EcoreTestFile.ecore
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/EcoreTestFile.ecore
@@ -3,7 +3,7 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="Bad" nsURI="http://www.eclipse.org/ocl/examples/EcoreTestFile.ecore"
     nsPrefix="pfx">
   <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="&lt;copyright>&#xA;&#xA;Copyright (c) 2012 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation&#xA;&#xA;&lt;/copyright>&#xA;&#xA;This Ecore file contains a number of problems for diagnosis as part of the Complete OCL Tutorial."/>
+    <details key="documentation" value="&lt;copyright>&#xA;&#xA;Copyright (c) 2012 Willink Transformations and others.&#xA;All rights reserved.   This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v2.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v20.html&#xA;&#xA;Contributors:&#xA;  E.D.Willink - Initial API and implementation&#xA;&#xA;&lt;/copyright>&#xA;&#xA;This Ecore file contains a number of problems for diagnosis as part of the Complete OCL Tutorial."/>
   </eAnnotations>
   <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
     <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraEcoreValidation.ocl b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraEcoreValidation.ocl
index 1132bc6..2af231f 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraEcoreValidation.ocl
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraEcoreValidation.ocl
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraUMLValidation.ocl b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraUMLValidation.ocl
index 76facd9..39f432d 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraUMLValidation.ocl
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraUMLValidation.ocl
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraXMIValidation.ocl b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraXMIValidation.ocl
index e53f868..156e2a5 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraXMIValidation.ocl
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraXMIValidation.ocl
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraXtextValidation.ocl b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraXtextValidation.ocl
index 36cd475..e653cf9 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraXtextValidation.ocl
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/ExtraXtextValidation.ocl
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/XtextTestFile.xtext b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/XtextTestFile.xtext
index a4634ff..1f203ae 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/XtextTestFile.xtext
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/model/XtextTestFile.xtext
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 itemis AG (http://www.itemis.eu) 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 grammar org.eclipse.xtext.example.arithmetics.Arithmetics with org.eclipse.xtext.common.Terminals
 
diff --git a/examples/org.eclipse.ocl.examples.project.completeocltutorial/src/Dummy.java b/examples/org.eclipse.ocl.examples.project.completeocltutorial/src/Dummy.java
index 3e582e3..8f792cf 100644
--- a/examples/org.eclipse.ocl.examples.project.completeocltutorial/src/Dummy.java
+++ b/examples/org.eclipse.ocl.examples.project.completeocltutorial/src/Dummy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.project.royalandloyal/about.html b/examples/org.eclipse.ocl.examples.project.royalandloyal/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.project.royalandloyal/about.html
+++ b/examples/org.eclipse.ocl.examples.project.royalandloyal/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.project.royalandloyal/model/RoyalAndLoyal.ocl b/examples/org.eclipse.ocl.examples.project.royalandloyal/model/RoyalAndLoyal.ocl
index 18434b6..5d4dd6b 100644
--- a/examples/org.eclipse.ocl.examples.project.royalandloyal/model/RoyalAndLoyal.ocl
+++ b/examples/org.eclipse.ocl.examples.project.royalandloyal/model/RoyalAndLoyal.ocl
@@ -1,9 +1,9 @@
 --------------------------------------------------------------------------------
 -- Copyright (c) 2007, 2015 M.Garcia 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 v2.0
 -- which accompanies this distribution, and is available at
--- http://www.eclipse.org/legal/epl-v10.html
+-- http://www.eclipse.org/legal/epl-v20.html
 --
 -- Contributors:
 --     J.Warmer, A.Kleppe - original example in 'The Object Constraint Language Second Edition'
diff --git a/examples/org.eclipse.ocl.examples.project.royalandloyal/plugin.properties b/examples/org.eclipse.ocl.examples.project.royalandloyal/plugin.properties
index ded191c..96f88fe 100644
--- a/examples/org.eclipse.ocl.examples.project.royalandloyal/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.project.royalandloyal/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005-2012 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.project.royalandloyal/src/Dummy.java b/examples/org.eclipse.ocl.examples.project.royalandloyal/src/Dummy.java
index 4723c9f..2ca456f 100644
--- a/examples/org.eclipse.ocl.examples.project.royalandloyal/src/Dummy.java
+++ b/examples/org.eclipse.ocl.examples.project.royalandloyal/src/Dummy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.standalone/about.html b/examples/org.eclipse.ocl.examples.standalone/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.standalone/about.html
+++ b/examples/org.eclipse.ocl.examples.standalone/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.standalone/build.properties b/examples/org.eclipse.ocl.examples.standalone/build.properties
index 476754e..4bd09de 100644
--- a/examples/org.eclipse.ocl.examples.standalone/build.properties
+++ b/examples/org.eclipse.ocl.examples.standalone/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Obeo 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.standalone/plugin.properties b/examples/org.eclipse.ocl.examples.standalone/plugin.properties
index 0389cb6..735b0b4 100644
--- a/examples/org.eclipse.ocl.examples.standalone/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.standalone/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/HelpCommand.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/HelpCommand.java
index 5f5b235..4db8240 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/HelpCommand.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/HelpCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneApplication.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneApplication.java
index 001ff23..56e211a 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneApplication.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneApplication.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneCommand.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneCommand.java
index b4914b8..4564494 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneCommand.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneCommandAnalyzer.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneCommandAnalyzer.java
index 828d7fe..e58d3bc 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneCommandAnalyzer.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneCommandAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneResponse.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneResponse.java
index 7160a1c..0e072d9 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneResponse.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/StandaloneResponse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/messages/StandaloneMessages.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/messages/StandaloneMessages.java
index fe9e7dc..b084012 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/messages/StandaloneMessages.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/messages/StandaloneMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/messages/StandaloneMessages.properties b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/messages/StandaloneMessages.properties
index d1dcad8..b0eabbd 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/messages/StandaloneMessages.properties
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/messages/StandaloneMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Obeo 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/validity/StandaloneValidityManager.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/validity/StandaloneValidityManager.java
index 6d2df36..82c608c 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/validity/StandaloneValidityManager.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/validity/StandaloneValidityManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/validity/ValidateCommand.java b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/validity/ValidateCommand.java
index 7d2a34a..e59aba4 100644
--- a/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/validity/ValidateCommand.java
+++ b/examples/org.eclipse.ocl.examples.standalone/src/org/eclipse/ocl/examples/standalone/validity/ValidateCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.ui/about.html b/examples/org.eclipse.ocl.examples.ui/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.ui/about.html
+++ b/examples/org.eclipse.ocl.examples.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.ui/build.properties b/examples/org.eclipse.ocl.examples.ui/build.properties
index ff1b573..f42b827 100644
--- a/examples/org.eclipse.ocl.examples.ui/build.properties
+++ b/examples/org.eclipse.ocl.examples.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.ui/plugin.properties b/examples/org.eclipse.ocl.examples.ui/plugin.properties
index ea9a2d3..2117721 100644
--- a/examples/org.eclipse.ocl.examples.ui/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.ui/src/org/eclipse/ocl/examples/ui/OCLPropertyTester.java b/examples/org.eclipse.ocl.examples.ui/src/org/eclipse/ocl/examples/ui/OCLPropertyTester.java
index 323234b..4f5e34c 100644
--- a/examples/org.eclipse.ocl.examples.ui/src/org/eclipse/ocl/examples/ui/OCLPropertyTester.java
+++ b/examples/org.eclipse.ocl.examples.ui/src/org/eclipse/ocl/examples/ui/OCLPropertyTester.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.uml25/about.html b/examples/org.eclipse.ocl.examples.uml25/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.uml25/about.html
+++ b/examples/org.eclipse.ocl.examples.uml25/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.uml25/build.properties b/examples/org.eclipse.ocl.examples.uml25/build.properties
index fc10ce5..62fdcb7 100644
--- a/examples/org.eclipse.ocl.examples.uml25/build.properties
+++ b/examples/org.eclipse.ocl.examples.uml25/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.uml25/emf-gen/org/eclipse/ocl/examples/uml25/UMLPlugin.java b/examples/org.eclipse.ocl.examples.uml25/emf-gen/org/eclipse/ocl/examples/uml25/UMLPlugin.java
index 47f9dfb..1b684c2 100644
--- a/examples/org.eclipse.ocl.examples.uml25/emf-gen/org/eclipse/ocl/examples/uml25/UMLPlugin.java
+++ b/examples/org.eclipse.ocl.examples.uml25/emf-gen/org/eclipse/ocl/examples/uml25/UMLPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.uml25/plugin.properties b/examples/org.eclipse.ocl.examples.uml25/plugin.properties
index ce3f322..c427a20 100644
--- a/examples/org.eclipse.ocl.examples.uml25/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.uml25/plugin.properties
@@ -1,18 +1,18 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #   E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.uml25/src/org/eclipse/ocl/examples/uml25/XMI252UMLExtendedMetaData.java b/examples/org.eclipse.ocl.examples.uml25/src/org/eclipse/ocl/examples/uml25/XMI252UMLExtendedMetaData.java
index 6eec0b8..5aa4f4c 100644
--- a/examples/org.eclipse.ocl.examples.uml25/src/org/eclipse/ocl/examples/uml25/XMI252UMLExtendedMetaData.java
+++ b/examples/org.eclipse.ocl.examples.uml25/src/org/eclipse/ocl/examples/uml25/XMI252UMLExtendedMetaData.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.uml25/src/org/eclipse/ocl/examples/uml25/XMI252UMLResourceFactoryImpl.java b/examples/org.eclipse.ocl.examples.uml25/src/org/eclipse/ocl/examples/uml25/XMI252UMLResourceFactoryImpl.java
index 18ffbb2..ee3a4ea 100644
--- a/examples/org.eclipse.ocl.examples.uml25/src/org/eclipse/ocl/examples/uml25/XMI252UMLResourceFactoryImpl.java
+++ b/examples/org.eclipse.ocl.examples.uml25/src/org/eclipse/ocl/examples/uml25/XMI252UMLResourceFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.unified/about.html b/examples/org.eclipse.ocl.examples.unified/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.unified/about.html
+++ b/examples/org.eclipse.ocl.examples.unified/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.unified/about.properties b/examples/org.eclipse.ocl.examples.unified/about.properties
index d64e2ba..190cf4f 100644
--- a/examples/org.eclipse.ocl.examples.unified/about.properties
+++ b/examples/org.eclipse.ocl.examples.unified/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.unified/build.properties b/examples/org.eclipse.ocl.examples.unified/build.properties
index 20ea58a..1603ab6 100644
--- a/examples/org.eclipse.ocl.examples.unified/build.properties
+++ b/examples/org.eclipse.ocl.examples.unified/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.unified/plugin.properties b/examples/org.eclipse.ocl.examples.unified/plugin.properties
index 68b1fe4..1ef8ec1 100644
--- a/examples/org.eclipse.ocl.examples.unified/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.unified/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/about.html b/examples/org.eclipse.ocl.examples.validity/about.html
index c258ef5..1ef80ac 100644
--- a/examples/org.eclipse.ocl.examples.validity/about.html
+++ b/examples/org.eclipse.ocl.examples.validity/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.ocl.examples.validity/build.properties b/examples/org.eclipse.ocl.examples.validity/build.properties
index 1293ffd..abc359a 100644
--- a/examples/org.eclipse.ocl.examples.validity/build.properties
+++ b/examples/org.eclipse.ocl.examples.validity/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Radek Dvorak - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/plugin.properties b/examples/org.eclipse.ocl.examples.validity/plugin.properties
index 75c6f2e..c0d8fb6 100644
--- a/examples/org.eclipse.ocl.examples.validity/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.validity/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/AbstractPivotConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/AbstractPivotConstraintLocator.java
index 7af5387..077c089 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/AbstractPivotConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/AbstractPivotConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/CompleteOCLCSConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/CompleteOCLCSConstraintLocator.java
index ab9dc0f..5368473 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/CompleteOCLCSConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/CompleteOCLCSConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/CompleteOCLCSUIConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/CompleteOCLCSUIConstraintLocator.java
index 393feb8..3f32f63 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/CompleteOCLCSUIConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/CompleteOCLCSUIConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateConstraintLocator.java
index c0be385..34a3a63 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateUIConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateUIConstraintLocator.java
index 9ee9ab6..8bd0bf4 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateUIConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/DelegateUIConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotConstraintLocator.java
index 53418ff..c24fd6c 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotUIConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotUIConstraintLocator.java
index f77d0a7..2a07888 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotUIConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/PivotUIConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLConstraintLocator.java
index 92be4f9..9311036 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLUIConstraintLocator.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLUIConstraintLocator.java
index b490165..d2e8666 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLUIConstraintLocator.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/locator/UMLUIConstraintLocator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/plugin/OCLValidityPlugin.java b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/plugin/OCLValidityPlugin.java
index d819a18..b8adb46 100644
--- a/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/plugin/OCLValidityPlugin.java
+++ b/examples/org.eclipse.ocl.examples.validity/src/org/eclipse/ocl/examples/validity/plugin/OCLValidityPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/about.html b/examples/org.eclipse.ocl.examples.xtext.console/about.html
index c0be2e9..e9d1dac 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/about.html
+++ b/examples/org.eclipse.ocl.examples.xtext.console/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.ocl.examples.xtext.console/build.properties b/examples/org.eclipse.ocl.examples.xtext.console/build.properties
index 482ee47..463d3cb 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/build.properties
+++ b/examples/org.eclipse.ocl.examples.xtext.console/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/plugin.properties b/examples/org.eclipse.ocl.examples.xtext.console/plugin.properties
index 35e2bd4..88aed5b 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.xtext.console/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/plugin.xml b/examples/org.eclipse.ocl.examples.xtext.console/plugin.xml
index cbc7f74..ab1bfd6 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/plugin.xml
+++ b/examples/org.eclipse.ocl.examples.xtext.console/plugin.xml
@@ -4,9 +4,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/ColorManager.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/ColorManager.java
index bfd59f7..40c5c74 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/ColorManager.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/ColorManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsole.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsole.java
index e3054d9..95780eb 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsole.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsole.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsoleFactory.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsoleFactory.java
index f263659..a7cf4d5 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsoleFactory.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsoleFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsolePage.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsolePage.java
index 481686d..57e72e4 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsolePage.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLConsolePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLResource.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLResource.java
index 48e9680..424e576 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLResource.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/OCLResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/TargetMetamodel.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/TargetMetamodel.java
index 2ee4d3f..34737fa 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/TargetMetamodel.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/TargetMetamodel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007,2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleIssueModificationContext.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleIssueModificationContext.java
index 0341733..15326ec 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleIssueModificationContext.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleIssueModificationContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsolePlugin.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsolePlugin.java
index b349352..7f1eb6a 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsolePlugin.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsolePlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleResourceSetProvider.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleResourceSetProvider.java
index 13bde57..a891051 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleResourceSetProvider.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleResourceSetProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleRuntimeModule.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleRuntimeModule.java
index 5ca570a..9779892 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleRuntimeModule.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleUiModule.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleUiModule.java
index 5a14471..759fc2d 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleUiModule.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/XtextConsoleUiModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/CloseAction.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/CloseAction.java
index ac6a11f..f5e484c 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/CloseAction.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/CloseAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/DebugAction.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/DebugAction.java
index 611d9c1..5916122 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/DebugAction.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/DebugAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/LoadExpressionAction.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/LoadExpressionAction.java
index 7ee8160..0dba6b2 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/LoadExpressionAction.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/LoadExpressionAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/SaveExpressionAction.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/SaveExpressionAction.java
index c9bb56a..a8aecbe 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/SaveExpressionAction.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/SaveExpressionAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/ShowConsoleHandler.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/ShowConsoleHandler.java
index dea4595..53b2ccb 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/ShowConsoleHandler.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/actions/ShowConsoleHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/messages/ConsoleMessages.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/messages/ConsoleMessages.java
index 1e245ba..0aa3550 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/messages/ConsoleMessages.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/messages/ConsoleMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/messages/ConsoleMessages.properties b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/messages/ConsoleMessages.properties
index 2a815ac..a271976 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/messages/ConsoleMessages.properties
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/messages/ConsoleMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextEditor.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextEditor.java
index ca7ce2e..55d8d46 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextEditor.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextEditor.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2010, 2016 ProxiAD 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextResource.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextResource.java
index bf7f5b9..5d95e0a 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextResource.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/EmbeddedXtextResource.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2010, 2014 ProxiAD 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Cedric Vidal (ProxiAD) - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingHelper.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingHelper.java
index 3a1303f..b0dc06b 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingHelper.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingHelper.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2010, 2014 itemis AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    itemis AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingReconciler.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingReconciler.java
index 86e22be..d4c8e9d 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingReconciler.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/HighlightingReconciler.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2010, 2018 itemis 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    itemis AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/TextViewerAction.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/TextViewerAction.java
index a2df37b..0d0c02f 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/TextViewerAction.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/TextViewerAction.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2010, 2014 itemis AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    itemis AG - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/ToggleSLCommentAction.java b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/ToggleSLCommentAction.java
index 7c82a9e..e1ec48c 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/ToggleSLCommentAction.java
+++ b/examples/org.eclipse.ocl.examples.xtext.console/src/org/eclipse/ocl/examples/xtext/console/xtfo/ToggleSLCommentAction.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2010, 2014 ProxiAD 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    Obeo - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/about.html b/examples/org.eclipse.ocl.examples.xtext2lpg/about.html
index 2f46c17..d75d996 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/about.html
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/build.properties b/examples/org.eclipse.ocl.examples.xtext2lpg/build.properties
index c8bffd2..b9d752e 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/build.properties
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/AbstractElement.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/AbstractElement.java
index ed294ae..a9230c7 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/AbstractElement.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/AbstractElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/AbstractRule.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/AbstractRule.java
index 7175862..1d99520 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/AbstractRule.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/AbstractRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ActionAssignment.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ActionAssignment.java
index d1e17d8..749e385 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ActionAssignment.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ActionAssignment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Assignment.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Assignment.java
index f377fc4..115bb53 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Assignment.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Assignment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/CharacterRange.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/CharacterRange.java
index 2588734..222565b 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/CharacterRange.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/CharacterRange.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Conjunction.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Conjunction.java
index f533079..103669b 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Conjunction.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Conjunction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Disjunction.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Disjunction.java
index c866fcc..3d18633 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Disjunction.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Disjunction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/EOF.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/EOF.java
index 1012c4f..6fe157a 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/EOF.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/EOF.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Epsilon.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Epsilon.java
index e31b36f..2c3dcac 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Epsilon.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Epsilon.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Grammar.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Grammar.java
index 7879e12..8dca149 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Grammar.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Grammar.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Keyword.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Keyword.java
index 85ab9eb..2c342bf 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Keyword.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Keyword.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/KeywordAssignment.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/KeywordAssignment.java
index 1e288dd..8dce403 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/KeywordAssignment.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/KeywordAssignment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/LexerGrammar.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/LexerGrammar.java
index 793a1f8..04eeee6 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/LexerGrammar.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/LexerGrammar.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/NegatedToken.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/NegatedToken.java
index 17f65d0..a84baef 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/NegatedToken.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/NegatedToken.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ParserGrammar.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ParserGrammar.java
index 3e60db4..a7a4a7d 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ParserGrammar.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ParserGrammar.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ParserRule.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ParserRule.java
index 351a231..5f62dc1 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ParserRule.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/ParserRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/RuleCall.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/RuleCall.java
index 4a08c11..d302904 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/RuleCall.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/RuleCall.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/RuleCallAssignment.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/RuleCallAssignment.java
index 98b9b0e..5797353 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/RuleCallAssignment.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/RuleCallAssignment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Syntax.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Syntax.java
index 10401ca..0f9b6b4 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Syntax.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Syntax.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/TerminalRule.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/TerminalRule.java
index 64c2cc6..ad687dd 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/TerminalRule.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/TerminalRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/TypedRule.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/TypedRule.java
index 63900d7..a4550c3 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/TypedRule.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/TypedRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/UntilToken.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/UntilToken.java
index 1ce67f1..4bb4893 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/UntilToken.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/UntilToken.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/UntypedRule.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/UntypedRule.java
index 1fd2f90..1d2aea7 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/UntypedRule.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/UntypedRule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Wildcard.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Wildcard.java
index 0990b59..971fba9 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Wildcard.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/Wildcard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/XBNFFactory.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/XBNFFactory.java
index 84a3fad..1d79399 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/XBNFFactory.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/XBNFFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/XBNFPackage.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/XBNFPackage.java
index ff32811..ab24998 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/XBNFPackage.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/XBNFPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AbstractElementImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AbstractElementImpl.java
index d26c607..4ce8d33 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AbstractElementImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AbstractElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AbstractRuleImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AbstractRuleImpl.java
index a923b32..f08266e 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AbstractRuleImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AbstractRuleImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ActionAssignmentImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ActionAssignmentImpl.java
index edb1cb7..4a05c4f 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ActionAssignmentImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ActionAssignmentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AssignmentImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AssignmentImpl.java
index 7967dfa..09565dd 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AssignmentImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/AssignmentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/CharacterRangeImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/CharacterRangeImpl.java
index 3514fe0..baf036f 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/CharacterRangeImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/CharacterRangeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ConjunctionImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ConjunctionImpl.java
index 0299bbb..608771d 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ConjunctionImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ConjunctionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/DisjunctionImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/DisjunctionImpl.java
index 36ea8c2..3713d49 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/DisjunctionImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/DisjunctionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/EOFImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/EOFImpl.java
index 9b2e0e1..9ece591 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/EOFImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/EOFImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/EpsilonImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/EpsilonImpl.java
index 52462d0..651fbb7 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/EpsilonImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/EpsilonImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/GrammarImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/GrammarImpl.java
index 4730291..76ad337 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/GrammarImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/GrammarImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/KeywordAssignmentImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/KeywordAssignmentImpl.java
index 3070ad7..b81dde1 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/KeywordAssignmentImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/KeywordAssignmentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/KeywordImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/KeywordImpl.java
index f2bf9df..816e40a 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/KeywordImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/KeywordImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/LexerGrammarImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/LexerGrammarImpl.java
index ca0c6c3..c416ec5 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/LexerGrammarImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/LexerGrammarImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/NegatedTokenImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/NegatedTokenImpl.java
index caaf100..b6ae341 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/NegatedTokenImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/NegatedTokenImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ParserGrammarImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ParserGrammarImpl.java
index 43eea9c..af339fa 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ParserGrammarImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ParserGrammarImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ParserRuleImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ParserRuleImpl.java
index 9ce2053..ef9dec0 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ParserRuleImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/ParserRuleImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/RuleCallAssignmentImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/RuleCallAssignmentImpl.java
index 1c45e67..7cf14bd 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/RuleCallAssignmentImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/RuleCallAssignmentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/RuleCallImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/RuleCallImpl.java
index d6f453a..43df2b2 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/RuleCallImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/RuleCallImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/SyntaxImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/SyntaxImpl.java
index 882645e..b6e6a16 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/SyntaxImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/SyntaxImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/TerminalRuleImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/TerminalRuleImpl.java
index 1f967cb..0661a44 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/TerminalRuleImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/TerminalRuleImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/TypedRuleImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/TypedRuleImpl.java
index e4b7a4d..8b82ca3 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/TypedRuleImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/TypedRuleImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/UntilTokenImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/UntilTokenImpl.java
index dbbc499..a6a7abe 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/UntilTokenImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/UntilTokenImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/UntypedRuleImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/UntypedRuleImpl.java
index ae47f7e..a699a79 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/UntypedRuleImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/UntypedRuleImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/WildcardImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/WildcardImpl.java
index 11cb39b..a948d72 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/WildcardImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/WildcardImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/XBNFFactoryImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/XBNFFactoryImpl.java
index 43e5b53..aaa9367 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/XBNFFactoryImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/XBNFFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/XBNFPackageImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/XBNFPackageImpl.java
index ae04ef1..7ad43fd 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/XBNFPackageImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/impl/XBNFPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/util/XBNFAdapterFactory.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/util/XBNFAdapterFactory.java
index 432e632..51b8219 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/util/XBNFAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/util/XBNFAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/util/XBNFSwitch.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/util/XBNFSwitch.java
index 79a458c..903e87c 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/util/XBNFSwitch.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNF/util/XBNFSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/Alternatives.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/Alternatives.java
index d7b5768..5fbfdde 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/Alternatives.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/Alternatives.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/CompoundElement.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/CompoundElement.java
index d2e4ad8..17ec19a 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/CompoundElement.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/CompoundElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/MultiplicityElement.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/MultiplicityElement.java
index 1436b18..a325412 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/MultiplicityElement.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/MultiplicityElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/OneOrMore.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/OneOrMore.java
index de8e073..4b53cfa 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/OneOrMore.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/OneOrMore.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/Succession.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/Succession.java
index 5f8c119..897dffa 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/Succession.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/Succession.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/XBNFwithCardinalityFactory.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/XBNFwithCardinalityFactory.java
index 654cb0c..b536610 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/XBNFwithCardinalityFactory.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/XBNFwithCardinalityFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/XBNFwithCardinalityPackage.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/XBNFwithCardinalityPackage.java
index 873f5f1..8775f64 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/XBNFwithCardinalityPackage.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/XBNFwithCardinalityPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/ZeroOrMore.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/ZeroOrMore.java
index 727ccad..c4c89e3 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/ZeroOrMore.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/ZeroOrMore.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/ZeroOrOne.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/ZeroOrOne.java
index 90d4565..11fa2d0 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/ZeroOrOne.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/ZeroOrOne.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/AlternativesImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/AlternativesImpl.java
index 304ae6b..f4346f9 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/AlternativesImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/AlternativesImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/CompoundElementImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/CompoundElementImpl.java
index 9087a9e..1df4f9e 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/CompoundElementImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/CompoundElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/MultiplicityElementImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/MultiplicityElementImpl.java
index 1a7fdd5..133ada0 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/MultiplicityElementImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/MultiplicityElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/OneOrMoreImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/OneOrMoreImpl.java
index 1ea662f..0cf7998 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/OneOrMoreImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/OneOrMoreImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/SuccessionImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/SuccessionImpl.java
index 1494844..062451b 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/SuccessionImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/SuccessionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/XBNFwithCardinalityFactoryImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/XBNFwithCardinalityFactoryImpl.java
index cb07dcc..0ec182e 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/XBNFwithCardinalityFactoryImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/XBNFwithCardinalityFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/XBNFwithCardinalityPackageImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/XBNFwithCardinalityPackageImpl.java
index 970ef3a..221d3d4 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/XBNFwithCardinalityPackageImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/XBNFwithCardinalityPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/ZeroOrMoreImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/ZeroOrMoreImpl.java
index a9c64bc..edcbb79 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/ZeroOrMoreImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/ZeroOrMoreImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/ZeroOrOneImpl.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/ZeroOrOneImpl.java
index 7ccbe55..61c4383 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/ZeroOrOneImpl.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/impl/ZeroOrOneImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/util/XBNFwithCardinalityAdapterFactory.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/util/XBNFwithCardinalityAdapterFactory.java
index fba8a38..859a5e3 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/util/XBNFwithCardinalityAdapterFactory.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/util/XBNFwithCardinalityAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/util/XBNFwithCardinalitySwitch.java b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/util/XBNFwithCardinalitySwitch.java
index 04f1d5e..b7e6b8a 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/util/XBNFwithCardinalitySwitch.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/emf-gen/org/eclipse/ocl/examples/xtext2lpg/XBNFwithCardinality/util/XBNFwithCardinalitySwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/plugin.properties b/examples/org.eclipse.ocl.examples.xtext2lpg/plugin.properties
index c66226b..33d0bc7 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/plugin.properties
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateAllLPGs.mwe2 b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateAllLPGs.mwe2
index fe15c8d..d4c58b7 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateAllLPGs.mwe2
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateAllLPGs.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPG.java b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPG.java
index fd0d18f..bacfec5 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPG.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPG.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPG.mwe2 b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPG.mwe2
index 9467b55..00efc5f 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPG.mwe2
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPG.mwe2
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPGUtils.java b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPGUtils.java
index 13d981d..cb6c4f8 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPGUtils.java
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPGUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPGXtend.xtend b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPGXtend.xtend
index ef3a7d9..5f818e9 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPGXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/GenerateLPGXtend.xtend
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/inline.qvto b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/inline.qvto
index 88dd2de..85251d5 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/inline.qvto
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/inline.qvto
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/normalize.qvto b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/normalize.qvto
index 71dc69f..ece67a9 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/normalize.qvto
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/normalize.qvto
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/xtext2xbnf.qvto b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/xtext2xbnf.qvto
index 88e097b..fca8f42 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/xtext2xbnf.qvto
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/src/org/eclipse/ocl/examples/xtext2lpg/xtext2xbnf.qvto
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples/about.html b/examples/org.eclipse.ocl.examples/about.html
index c0be2e9..e9d1dac 100644
--- a/examples/org.eclipse.ocl.examples/about.html
+++ b/examples/org.eclipse.ocl.examples/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/examples/org.eclipse.ocl.examples/about.properties b/examples/org.eclipse.ocl.examples/about.properties
index ee7deda..1931a73 100644
--- a/examples/org.eclipse.ocl.examples/about.properties
+++ b/examples/org.eclipse.ocl.examples/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples/build.properties b/examples/org.eclipse.ocl.examples/build.properties
index 20484c5..2e7c555 100644
--- a/examples/org.eclipse.ocl.examples/build.properties
+++ b/examples/org.eclipse.ocl.examples/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples/plugin.properties b/examples/org.eclipse.ocl.examples/plugin.properties
index 6200718..4d596a6 100644
--- a/examples/org.eclipse.ocl.examples/plugin.properties
+++ b/examples/org.eclipse.ocl.examples/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/examples/org.eclipse.ocl.examples/plugin.xml b/examples/org.eclipse.ocl.examples/plugin.xml
index 9de0cfd..e1fdd36 100644
--- a/examples/org.eclipse.ocl.examples/plugin.xml
+++ b/examples/org.eclipse.ocl.examples/plugin.xml
@@ -3,9 +3,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/features/org.eclipse.ocl-feature/build.properties b/features/org.eclipse.ocl-feature/build.properties
index a3c4140..466540d 100644
--- a/features/org.eclipse.ocl-feature/build.properties
+++ b/features/org.eclipse.ocl-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl-feature/feature.properties b/features/org.eclipse.ocl-feature/feature.properties
index 8d6bae8..189cec0 100644
--- a/features/org.eclipse.ocl-feature/feature.properties
+++ b/features/org.eclipse.ocl-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.all-feature/build.properties b/features/org.eclipse.ocl.all-feature/build.properties
index f287682..465bc6c 100644
--- a/features/org.eclipse.ocl.all-feature/build.properties
+++ b/features/org.eclipse.ocl.all-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.all-feature/feature.properties b/features/org.eclipse.ocl.all-feature/feature.properties
index 32c36e0..f4a6162 100644
--- a/features/org.eclipse.ocl.all-feature/feature.properties
+++ b/features/org.eclipse.ocl.all-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.all.sdk-feature/build.properties b/features/org.eclipse.ocl.all.sdk-feature/build.properties
index f287682..465bc6c 100644
--- a/features/org.eclipse.ocl.all.sdk-feature/build.properties
+++ b/features/org.eclipse.ocl.all.sdk-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.all.sdk-feature/feature.properties b/features/org.eclipse.ocl.all.sdk-feature/feature.properties
index f4ac2d4..3cc1b92 100644
--- a/features/org.eclipse.ocl.all.sdk-feature/feature.properties
+++ b/features/org.eclipse.ocl.all.sdk-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.core.sdk-feature/build.properties b/features/org.eclipse.ocl.core.sdk-feature/build.properties
index f287682..465bc6c 100644
--- a/features/org.eclipse.ocl.core.sdk-feature/build.properties
+++ b/features/org.eclipse.ocl.core.sdk-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.core.sdk-feature/feature.properties b/features/org.eclipse.ocl.core.sdk-feature/feature.properties
index 78e3a4b..f218c60 100644
--- a/features/org.eclipse.ocl.core.sdk-feature/feature.properties
+++ b/features/org.eclipse.ocl.core.sdk-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.doc-feature/build.properties b/features/org.eclipse.ocl.doc-feature/build.properties
index f287682..465bc6c 100644
--- a/features/org.eclipse.ocl.doc-feature/build.properties
+++ b/features/org.eclipse.ocl.doc-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.doc-feature/feature.properties b/features/org.eclipse.ocl.doc-feature/feature.properties
index 43bf6f3..c2a5831 100644
--- a/features/org.eclipse.ocl.doc-feature/feature.properties
+++ b/features/org.eclipse.ocl.doc-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.edit-feature/build.properties b/features/org.eclipse.ocl.edit-feature/build.properties
index 7d109a0..aaa8a72 100644
--- a/features/org.eclipse.ocl.edit-feature/build.properties
+++ b/features/org.eclipse.ocl.edit-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.edit-feature/feature.properties b/features/org.eclipse.ocl.edit-feature/feature.properties
index 6b63757..5155ada 100644
--- a/features/org.eclipse.ocl.edit-feature/feature.properties
+++ b/features/org.eclipse.ocl.edit-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.examples-feature/build.properties b/features/org.eclipse.ocl.examples-feature/build.properties
index 4e6f884..3aca1be 100644
--- a/features/org.eclipse.ocl.examples-feature/build.properties
+++ b/features/org.eclipse.ocl.examples-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.examples-feature/feature.properties b/features/org.eclipse.ocl.examples-feature/feature.properties
index da070c8..ec23c5b 100644
--- a/features/org.eclipse.ocl.examples-feature/feature.properties
+++ b/features/org.eclipse.ocl.examples-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.examples.classic-feature/build.properties b/features/org.eclipse.ocl.examples.classic-feature/build.properties
index 4e6f884..3aca1be 100644
--- a/features/org.eclipse.ocl.examples.classic-feature/build.properties
+++ b/features/org.eclipse.ocl.examples.classic-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.examples.classic-feature/feature.properties b/features/org.eclipse.ocl.examples.classic-feature/feature.properties
index 226a45e..86ccd7e 100644
--- a/features/org.eclipse.ocl.examples.classic-feature/feature.properties
+++ b/features/org.eclipse.ocl.examples.classic-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.examples.tests-feature/build.properties b/features/org.eclipse.ocl.examples.tests-feature/build.properties
index b00a940..9ada34a 100644
--- a/features/org.eclipse.ocl.examples.tests-feature/build.properties
+++ b/features/org.eclipse.ocl.examples.tests-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.examples.tests-feature/feature.properties b/features/org.eclipse.ocl.examples.tests-feature/feature.properties
index 51133a5..b163475 100644
--- a/features/org.eclipse.ocl.examples.tests-feature/feature.properties
+++ b/features/org.eclipse.ocl.examples.tests-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2014 Open Canarias S.L. 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Open Canarias) - initial API and implementation
diff --git a/features/org.eclipse.ocl.examples.unified-feature/build.properties b/features/org.eclipse.ocl.examples.unified-feature/build.properties
index 4e6f884..3aca1be 100644
--- a/features/org.eclipse.ocl.examples.unified-feature/build.properties
+++ b/features/org.eclipse.ocl.examples.unified-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.examples.unified-feature/feature.properties b/features/org.eclipse.ocl.examples.unified-feature/feature.properties
index 8b48d8d..db60cd1 100644
--- a/features/org.eclipse.ocl.examples.unified-feature/feature.properties
+++ b/features/org.eclipse.ocl.examples.unified-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.master-feature/build.properties b/features/org.eclipse.ocl.master-feature/build.properties
index ed033b8..3c37541 100644
--- a/features/org.eclipse.ocl.master-feature/build.properties
+++ b/features/org.eclipse.ocl.master-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.master-feature/feature.properties b/features/org.eclipse.ocl.master-feature/feature.properties
index db0cddc..96907af 100644
--- a/features/org.eclipse.ocl.master-feature/feature.properties
+++ b/features/org.eclipse.ocl.master-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.tests-feature/build.properties b/features/org.eclipse.ocl.tests-feature/build.properties
index 4e6f884..3aca1be 100644
--- a/features/org.eclipse.ocl.tests-feature/build.properties
+++ b/features/org.eclipse.ocl.tests-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.tests-feature/feature.properties b/features/org.eclipse.ocl.tests-feature/feature.properties
index de993bb..fd38c85 100644
--- a/features/org.eclipse.ocl.tests-feature/feature.properties
+++ b/features/org.eclipse.ocl.tests-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2003, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.ui-feature/build.properties b/features/org.eclipse.ocl.ui-feature/build.properties
index b00a940..9ada34a 100644
--- a/features/org.eclipse.ocl.ui-feature/build.properties
+++ b/features/org.eclipse.ocl.ui-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.ui-feature/feature.properties b/features/org.eclipse.ocl.ui-feature/feature.properties
index 60f19f4..c4a2c70 100644
--- a/features/org.eclipse.ocl.ui-feature/feature.properties
+++ b/features/org.eclipse.ocl.ui-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.uml-feature/build.properties b/features/org.eclipse.ocl.uml-feature/build.properties
index 4e6f884..3aca1be 100644
--- a/features/org.eclipse.ocl.uml-feature/build.properties
+++ b/features/org.eclipse.ocl.uml-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.uml-feature/feature.properties b/features/org.eclipse.ocl.uml-feature/feature.properties
index cd579eb..5a1db14 100644
--- a/features/org.eclipse.ocl.uml-feature/feature.properties
+++ b/features/org.eclipse.ocl.uml-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/features/org.eclipse.ocl.unified.core-feature/build.properties b/features/org.eclipse.ocl.unified.core-feature/build.properties
index dde916b..a8d2c15 100644
--- a/features/org.eclipse.ocl.unified.core-feature/build.properties
+++ b/features/org.eclipse.ocl.unified.core-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.unified.core-feature/feature.properties b/features/org.eclipse.ocl.unified.core-feature/feature.properties
index 2b3ed03..4645ecb 100644
--- a/features/org.eclipse.ocl.unified.core-feature/feature.properties
+++ b/features/org.eclipse.ocl.unified.core-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.unified.ui-feature/build.properties b/features/org.eclipse.ocl.unified.ui-feature/build.properties
index dde916b..a8d2c15 100644
--- a/features/org.eclipse.ocl.unified.ui-feature/build.properties
+++ b/features/org.eclipse.ocl.unified.ui-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/features/org.eclipse.ocl.unified.ui-feature/feature.properties b/features/org.eclipse.ocl.unified.ui-feature/feature.properties
index a9cd204..fa41630 100644
--- a/features/org.eclipse.ocl.unified.ui-feature/feature.properties
+++ b/features/org.eclipse.ocl.unified.ui-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.all/about.html b/plugins/org.eclipse.ocl.all/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.all/about.html
+++ b/plugins/org.eclipse.ocl.all/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.all/about.properties b/plugins/org.eclipse.ocl.all/about.properties
index ac722f2..80034a9 100644
--- a/plugins/org.eclipse.ocl.all/about.properties
+++ b/plugins/org.eclipse.ocl.all/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.all/build.properties b/plugins/org.eclipse.ocl.all/build.properties
index 20ea58a..1603ab6 100644
--- a/plugins/org.eclipse.ocl.all/build.properties
+++ b/plugins/org.eclipse.ocl.all/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.all/plugin.properties b/plugins/org.eclipse.ocl.all/plugin.properties
index 4d3aa39..bb70bf6 100644
--- a/plugins/org.eclipse.ocl.all/plugin.properties
+++ b/plugins/org.eclipse.ocl.all/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.capabilities/about.html b/plugins/org.eclipse.ocl.capabilities/about.html
index c0be2e9..e9d1dac 100644
--- a/plugins/org.eclipse.ocl.capabilities/about.html
+++ b/plugins/org.eclipse.ocl.capabilities/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.capabilities/build.properties b/plugins/org.eclipse.ocl.capabilities/build.properties
index d46d218..2977726 100644
--- a/plugins/org.eclipse.ocl.capabilities/build.properties
+++ b/plugins/org.eclipse.ocl.capabilities/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 #  Copyright (c) 2009 Open Canarias S.L., 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 v2.0
 #  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+#  http://www.eclipse.org/legal/epl-v20.html
 # 
 #  Contributors:
 #      Adolfo Sanchez-Barbudo Herrera - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.capabilities/copyright.txt b/plugins/org.eclipse.ocl.capabilities/copyright.txt
index b90e50c..b496bd7 100644
--- a/plugins/org.eclipse.ocl.capabilities/copyright.txt
+++ b/plugins/org.eclipse.ocl.capabilities/copyright.txt
@@ -1,8 +1,8 @@
 Copyright (c) 2009 Open Canarias S.L., 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 v2.0
 which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+http://www.eclipse.org/legal/epl-v20.html
 
 Contributors:
    Adolfo Sanchez-Barbudo Herrera - initial API and implementation
\ No newline at end of file
diff --git a/plugins/org.eclipse.ocl.capabilities/plugin.properties b/plugins/org.eclipse.ocl.capabilities/plugin.properties
index e0746bb..3ff72d2 100644
--- a/plugins/org.eclipse.ocl.capabilities/plugin.properties
+++ b/plugins/org.eclipse.ocl.capabilities/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2014 Open Canarias S.L. , 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.capabilities/plugin.xml b/plugins/org.eclipse.ocl.capabilities/plugin.xml
index 1c0dd15..279cf3b 100644
--- a/plugins/org.eclipse.ocl.capabilities/plugin.xml
+++ b/plugins/org.eclipse.ocl.capabilities/plugin.xml
@@ -3,9 +3,9 @@
 <!--
      Copyright (c) 2009 Open Canarias S.L. 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 v2.0
      which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
+     http://www.eclipse.org/legal/epl-v20.html
     
      Contributors:
          Adolfo Sanchez-Barbudo Herrera - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/about.html b/plugins/org.eclipse.ocl.common.ui/about.html
index 04b5c76..421427c 100644
--- a/plugins/org.eclipse.ocl.common.ui/about.html
+++ b/plugins/org.eclipse.ocl.common.ui/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.common.ui/build.properties b/plugins/org.eclipse.ocl.common.ui/build.properties
index 846988d..88cb747 100644
--- a/plugins/org.eclipse.ocl.common.ui/build.properties
+++ b/plugins/org.eclipse.ocl.common.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/plugin.properties b/plugins/org.eclipse.ocl.common.ui/plugin.properties
index 04bcd01..1644e24 100644
--- a/plugins/org.eclipse.ocl.common.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.common.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/CommonUIConstants.java b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/CommonUIConstants.java
index f930f92..17636b1 100644
--- a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/CommonUIConstants.java
+++ b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/CommonUIConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/OCLCommonUI.java b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/OCLCommonUI.java
index 7633b15..0c5083d 100644
--- a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/OCLCommonUI.java
+++ b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/OCLCommonUI.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/Activator.java b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/Activator.java
index c515e54..97b274b 100644
--- a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/Activator.java
+++ b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/Activator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/messages/CommonUIMessages.java b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/messages/CommonUIMessages.java
index 8fbe248..0f32969 100644
--- a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/messages/CommonUIMessages.java
+++ b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/messages/CommonUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/messages/CommonUIMessages.properties b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/messages/CommonUIMessages.properties
index 4185bde..5f10a71 100644
--- a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/messages/CommonUIMessages.properties
+++ b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/messages/CommonUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/AbstractProjectPreferencePage.java b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/AbstractProjectPreferencePage.java
index a9ca20f..ee52894 100644
--- a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/AbstractProjectPreferencePage.java
+++ b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/AbstractProjectPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/BlankProjectPreferencePage.java b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/BlankProjectPreferencePage.java
index 3d65dea..879afe3 100644
--- a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/BlankProjectPreferencePage.java
+++ b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/BlankProjectPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/CommonProjectPreferencePage.java b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/CommonProjectPreferencePage.java
index f345ad3..b2bb737 100644
--- a/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/CommonProjectPreferencePage.java
+++ b/plugins/org.eclipse.ocl.common.ui/src/org/eclipse/ocl/common/ui/internal/preferences/CommonProjectPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/about.html b/plugins/org.eclipse.ocl.common/about.html
index 04b5c76..421427c 100644
--- a/plugins/org.eclipse.ocl.common/about.html
+++ b/plugins/org.eclipse.ocl.common/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.common/build.properties b/plugins/org.eclipse.ocl.common/build.properties
index 3708113..3b65856 100644
--- a/plugins/org.eclipse.ocl.common/build.properties
+++ b/plugins/org.eclipse.ocl.common/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/plugin.properties b/plugins/org.eclipse.ocl.common/plugin.properties
index 94fc390..4a19174 100644
--- a/plugins/org.eclipse.ocl.common/plugin.properties
+++ b/plugins/org.eclipse.ocl.common/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLCommon.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLCommon.java
index bb0f1a8..2f0265f 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLCommon.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLCommon.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLConstants.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLConstants.java
index c9c4202..23ec4da 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLConstants.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/OCLConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/delegate/DelegateResourceSetAdapter.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/delegate/DelegateResourceSetAdapter.java
index f10d0c4..cbeea23 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/delegate/DelegateResourceSetAdapter.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/delegate/DelegateResourceSetAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/delegate/VirtualDelegateMapping.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/delegate/VirtualDelegateMapping.java
index 8d10611..1bb3854 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/delegate/VirtualDelegateMapping.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/delegate/VirtualDelegateMapping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLDelegateException.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLDelegateException.java
index e1ed02b..968cf4a 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLDelegateException.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLDelegateException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLInvocationDelegateMapping.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLInvocationDelegateMapping.java
index cf0c910..ad70d8e 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLInvocationDelegateMapping.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLInvocationDelegateMapping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLQueryDelegateMapping.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLQueryDelegateMapping.java
index 9a8900d..a3278d2 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLQueryDelegateMapping.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLQueryDelegateMapping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLSettingDelegateMapping.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLSettingDelegateMapping.java
index 4f8e4d7..d60453f 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLSettingDelegateMapping.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLSettingDelegateMapping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLValidationDelegateMapping.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLValidationDelegateMapping.java
index 6483969..ce3ff4a 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLValidationDelegateMapping.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/delegate/OCLValidationDelegateMapping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/messages/CommonMessages.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/messages/CommonMessages.java
index 8216d26..90394e6 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/messages/CommonMessages.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/messages/CommonMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/messages/CommonMessages.properties b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/messages/CommonMessages.properties
index 90f5608..dedace1 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/messages/CommonMessages.properties
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/messages/CommonMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/options/CodeGenerationMode.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/options/CodeGenerationMode.java
index 72560e9..555b780 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/options/CodeGenerationMode.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/options/CodeGenerationMode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/options/CommonOptions.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/options/CommonOptions.java
index b105f89..7d7e5db 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/options/CommonOptions.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/options/CommonOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/AnnotatedPreferenceInitializer.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/AnnotatedPreferenceInitializer.java
index fc08c37..eca2e7a 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/AnnotatedPreferenceInitializer.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/AnnotatedPreferenceInitializer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/BooleanPreference.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/BooleanPreference.java
index 6bcb88bf..6a1dcf7 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/BooleanPreference.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/BooleanPreference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/ClassPreference.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/ClassPreference.java
index 51d469c..cd38fb9 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/ClassPreference.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/ClassPreference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/CommonPreferenceInitializer.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/CommonPreferenceInitializer.java
index 1ec82d5..4b42934 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/CommonPreferenceInitializer.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/CommonPreferenceInitializer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/EnumerationPreference.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/EnumerationPreference.java
index 71c993e..94c3f67 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/EnumerationPreference.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/EnumerationPreference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/Preference.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/Preference.java
index 2382860..0b34270 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/Preference.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/Preference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/StringPreference.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/StringPreference.java
index dcb151a..7563c2e 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/StringPreference.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/internal/preferences/StringPreference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/preferences/PreferenceableOption.java b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/preferences/PreferenceableOption.java
index dd51b73..7caa92b 100644
--- a/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/preferences/PreferenceableOption.java
+++ b/plugins/org.eclipse.ocl.common/src/org/eclipse/ocl/common/preferences/PreferenceableOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/about.html b/plugins/org.eclipse.ocl.ecore.edit/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/about.html
+++ b/plugins/org.eclipse.ocl.ecore.edit/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.ecore.edit/build.properties b/plugins/org.eclipse.ocl.ecore.edit/build.properties
index 4afa3b7..75fd630 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/build.properties
+++ b/plugins/org.eclipse.ocl.ecore.edit/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/plugin.properties b/plugins/org.eclipse.ocl.ecore.edit/plugin.properties
index b667e1a..f892dcd 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/plugin.properties
+++ b/plugins/org.eclipse.ocl.ecore.edit/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/plugin.xml b/plugins/org.eclipse.ocl.ecore.edit/plugin.xml
index b10827d..1efa3ec 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/plugin.xml
+++ b/plugins/org.eclipse.ocl.ecore.edit/plugin.xml
@@ -4,9 +4,9 @@
 <!--
  Copyright (c) 2009 Willink Transformations 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 v2.0
  which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
 
  Contributors:
    E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/edit/OCLEcoreEditPlugin.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/edit/OCLEcoreEditPlugin.java
index 78e109c..c4e8412 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/edit/OCLEcoreEditPlugin.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/edit/OCLEcoreEditPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/AnyTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/AnyTypeItemProvider.java
index 28cdfd3..b310e83 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/AnyTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/AnyTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/AssociationClassCallExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/AssociationClassCallExpItemProvider.java
index 0956637..265d151 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/AssociationClassCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/AssociationClassCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/BagTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/BagTypeItemProvider.java
index d0345ff..4244a8e 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/BagTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/BagTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/BooleanLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/BooleanLiteralExpItemProvider.java
index fb4997d..e752a21 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/BooleanLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/BooleanLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CallExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CallExpItemProvider.java
index e581daf..4c63f0a 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CallOperationActionItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CallOperationActionItemProvider.java
index 524250e..a7a9c67 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CallOperationActionItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CallOperationActionItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionItemItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionItemItemProvider.java
index a1c621c..4ed6c61 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionItemItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionItemItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionLiteralExpItemProvider.java
index 5cf28d2..9a8040e 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionLiteralPartItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionLiteralPartItemProvider.java
index 67802b3..6d15b35 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionLiteralPartItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionLiteralPartItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionRangeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionRangeItemProvider.java
index 2da51af..3d1b290 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionRangeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionRangeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionTypeItemProvider.java
index 82add0d..8aaf003 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/CollectionTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ConstraintItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ConstraintItemProvider.java
index 471f942..d3ee36e 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ConstraintItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ConstraintItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/EcoreItemProviderAdapterFactory.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/EcoreItemProviderAdapterFactory.java
index 115acca..4a336bb 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/EcoreItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/EcoreItemProviderAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ElementTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ElementTypeItemProvider.java
index ea3df77..5df7f25 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ElementTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ElementTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/EnumLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/EnumLiteralExpItemProvider.java
index 7607041..e873249 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/EnumLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/EnumLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ExpressionInOCLItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ExpressionInOCLItemProvider.java
index 3e1ef6b..efddd98 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ExpressionInOCLItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/ExpressionInOCLItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/FeatureCallExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/FeatureCallExpItemProvider.java
index b32c968..87149c6 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/FeatureCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/FeatureCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IfExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IfExpItemProvider.java
index cde301e..39212a0 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IfExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IfExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IntegerLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IntegerLiteralExpItemProvider.java
index 85d8bd1..ea9de4b 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IntegerLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IntegerLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/InvalidLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/InvalidLiteralExpItemProvider.java
index b01f917..999f068 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/InvalidLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/InvalidLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/InvalidTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/InvalidTypeItemProvider.java
index e6a0860..24dc6ab 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/InvalidTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/InvalidTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IterateExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IterateExpItemProvider.java
index 2d3638b..3c8075a 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IterateExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IterateExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IteratorExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IteratorExpItemProvider.java
index 4a5e0ad..af79590 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IteratorExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/IteratorExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LetExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LetExpItemProvider.java
index cd4d650..7f41717 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LetExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LetExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LiteralExpItemProvider.java
index 118bf93..ad81762 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LoopExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LoopExpItemProvider.java
index 727f372..cda515c 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LoopExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/LoopExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/MessageExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/MessageExpItemProvider.java
index 2664c0f..402be1e 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/MessageExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/MessageExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/MessageTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/MessageTypeItemProvider.java
index 661efda..0c6d49c 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/MessageTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/MessageTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NavigationCallExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NavigationCallExpItemProvider.java
index 08ee49f..9bc2a22 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NavigationCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NavigationCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NullLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NullLiteralExpItemProvider.java
index 972a5b4..4c20517 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NullLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NullLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NumericLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NumericLiteralExpItemProvider.java
index df14050..d6f85a1 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NumericLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/NumericLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OCLExpressionItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OCLExpressionItemProvider.java
index ec4b49f..47395b3 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OCLExpressionItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OCLExpressionItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OperationCallExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OperationCallExpItemProvider.java
index b1a69e1..6e4305a 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OperationCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OperationCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OppositePropertyCallExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OppositePropertyCallExpItemProvider.java
index 696cc90..26e20e7 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OppositePropertyCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OppositePropertyCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OrderedSetTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OrderedSetTypeItemProvider.java
index 845642f..b15fccc 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OrderedSetTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/OrderedSetTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PrimitiveLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PrimitiveLiteralExpItemProvider.java
index 43b7172..c68483c 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PrimitiveLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PrimitiveLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PrimitiveTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PrimitiveTypeItemProvider.java
index 5461d00..5b5a460 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PrimitiveTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PrimitiveTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PropertyCallExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PropertyCallExpItemProvider.java
index 8ba7d66..ddf691f 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PropertyCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/PropertyCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/RealLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/RealLiteralExpItemProvider.java
index 815668a..711053e 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/RealLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/RealLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SendSignalActionItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SendSignalActionItemProvider.java
index 9e1e31b..5571c90 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SendSignalActionItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SendSignalActionItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SequenceTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SequenceTypeItemProvider.java
index a541032..c6793b1 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SequenceTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SequenceTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SetTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SetTypeItemProvider.java
index 219ec21..2f4fd70 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SetTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/SetTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/StateExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/StateExpItemProvider.java
index a2190a3..dd003c5 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/StateExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/StateExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/StringLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/StringLiteralExpItemProvider.java
index 0c6451c..45c3ea0 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/StringLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/StringLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TemplateParameterTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TemplateParameterTypeItemProvider.java
index 59daea4..1812822 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TemplateParameterTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TemplateParameterTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleLiteralExpItemProvider.java
index f4b2366..395ff38 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleLiteralPartItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleLiteralPartItemProvider.java
index 9cc0265..cf7dad6 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleLiteralPartItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleLiteralPartItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleTypeItemProvider.java
index e1de882..c345825 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TupleTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TypeExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TypeExpItemProvider.java
index 7780027..435641f 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TypeExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TypeExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TypeTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TypeTypeItemProvider.java
index 7557cca..e47e1f8 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TypeTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/TypeTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/UnlimitedNaturalLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/UnlimitedNaturalLiteralExpItemProvider.java
index 59cc2a8..a4a9c81 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/UnlimitedNaturalLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/UnlimitedNaturalLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/UnspecifiedValueExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/UnspecifiedValueExpItemProvider.java
index fd96e51..9d3baa9 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/UnspecifiedValueExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/UnspecifiedValueExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VariableExpItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VariableExpItemProvider.java
index a36c1ee..0d22b7d 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VariableExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VariableExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VariableItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VariableItemProvider.java
index 6418326..66751de 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VariableItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VariableItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VoidTypeItemProvider.java b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VoidTypeItemProvider.java
index 5c800c2..076e712 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VoidTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.ecore.edit/src/org/eclipse/ocl/ecore/provider/VoidTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/about.html b/plugins/org.eclipse.ocl.ecore/about.html
index c0be2e9..e9d1dac 100644
--- a/plugins/org.eclipse.ocl.ecore/about.html
+++ b/plugins/org.eclipse.ocl.ecore/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.ecore/about.properties b/plugins/org.eclipse.ocl.ecore/about.properties
index 0441c22..56e49ca 100644
--- a/plugins/org.eclipse.ocl.ecore/about.properties
+++ b/plugins/org.eclipse.ocl.ecore/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/build.properties b/plugins/org.eclipse.ocl.ecore/build.properties
index bf572b8..95069b1 100644
--- a/plugins/org.eclipse.ocl.ecore/build.properties
+++ b/plugins/org.eclipse.ocl.ecore/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/plugin.properties b/plugins/org.eclipse.ocl.ecore/plugin.properties
index 8194ba7..3604bf6 100644
--- a/plugins/org.eclipse.ocl.ecore/plugin.properties
+++ b/plugins/org.eclipse.ocl.ecore/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/plugin.xml b/plugins/org.eclipse.ocl.ecore/plugin.xml
index 59faafe..c8cdf24 100644
--- a/plugins/org.eclipse.ocl.ecore/plugin.xml
+++ b/plugins/org.eclipse.ocl.ecore/plugin.xml
@@ -4,9 +4,9 @@
 <!--
  Copyright (c) 2006, 2012 IBM Corporation 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 v2.0
  which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
 
  Contributors:
    IBM - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/AnyType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/AnyType.java
index 268ad16..e614779 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/AnyType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/AnyType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/AssociationClassCallExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/AssociationClassCallExp.java
index b889cc5..75018b3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/AssociationClassCallExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/AssociationClassCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/BagType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/BagType.java
index 721183c..6ea7732 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/BagType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/BagType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/BooleanLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/BooleanLiteralExp.java
index 3e34245..d15022f 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/BooleanLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/BooleanLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CallExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CallExp.java
index 76498eb..3627cc1 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CallExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CallOperationAction.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CallOperationAction.java
index 12e021d..4c0a0be 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CallOperationAction.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CallOperationAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionItem.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionItem.java
index 86d5a5d..5ee9d83 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionItem.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionItem.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionLiteralExp.java
index 60ce762..2f26a9e 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionLiteralPart.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionLiteralPart.java
index f56bc54..ba4fcb5 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionLiteralPart.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionLiteralPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionRange.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionRange.java
index e88cc01..348a84b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionRange.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionRange.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionType.java
index 375476b..97f2666 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/CollectionType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/Constraint.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/Constraint.java
index 505e803..e71d2da 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/Constraint.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/Constraint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironment.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironment.java
index 81ac989..46231e3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironment.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironmentFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironmentFactory.java
index 36aa6b9..61f7954 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEvaluationEnvironment.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEvaluationEnvironment.java
index f768805..f7750c3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEvaluationEnvironment.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2015, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreFactory.java
index 81295b9..9283cae 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreOCLStandardLibrary.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreOCLStandardLibrary.java
index c3e74d9..db7fd75 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreOCLStandardLibrary.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcoreOCLStandardLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     A. Sanchez-Barbudo Herrera - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcorePackage.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcorePackage.java
index 8a1afdf..cf37763 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcorePackage.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EcorePackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/ElementType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/ElementType.java
index 898a55f..af66f9b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/ElementType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/ElementType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnumLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnumLiteralExp.java
index 595190d..1f23a0f 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnumLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnumLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnvironmentWithHiddenOpposites.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnvironmentWithHiddenOpposites.java
index 86f5411..030fe3d 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnvironmentWithHiddenOpposites.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EnvironmentWithHiddenOpposites.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationEnvironmentWithHiddenOpposites.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationEnvironmentWithHiddenOpposites.java
index de0b056..2f7bf63 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationEnvironmentWithHiddenOpposites.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationEnvironmentWithHiddenOpposites.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationVisitorImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationVisitorImpl.java
index 17b6383..94acd3b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationVisitorImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/EvaluationVisitorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/ExpressionInOCL.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/ExpressionInOCL.java
index c0ed9a6..094c2d3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/ExpressionInOCL.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/ExpressionInOCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/FeatureCallExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/FeatureCallExp.java
index 5b706f3..8424431 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/FeatureCallExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/FeatureCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IfExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IfExp.java
index 4a3b9a5..4d72c6c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IfExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IfExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IntegerLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IntegerLiteralExp.java
index db8fe17..f40113b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IntegerLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IntegerLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/InvalidLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/InvalidLiteralExp.java
index f016990..7a8bef9 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/InvalidLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/InvalidLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/InvalidType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/InvalidType.java
index 2e9b9db..cd86bf3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/InvalidType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/InvalidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IterateExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IterateExp.java
index c413adf..637fa81 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IterateExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IterateExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IteratorExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IteratorExp.java
index 2227905..5779471 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IteratorExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/IteratorExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LetExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LetExp.java
index 81cea1d..a50ab2e 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LetExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LetExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LiteralExp.java
index 73bafaa..baf2e9d 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LoopExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LoopExp.java
index f8f02d1..083319a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LoopExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/LoopExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/MessageExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/MessageExp.java
index 8a71cd7..8960f4d 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/MessageExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/MessageExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/MessageType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/MessageType.java
index b711e75..21047f5 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/MessageType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/MessageType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NavigationCallExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NavigationCallExp.java
index a38d96b..354e5b6 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NavigationCallExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NavigationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NullLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NullLiteralExp.java
index 678026a..764a774 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NullLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NullLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NumericLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NumericLiteralExp.java
index a89f65a..5577b4f 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NumericLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/NumericLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCL.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCL.java
index c6a87e2..105e799 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCL.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCLExpression.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCLExpression.java
index f2eb153..6515e5c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCLExpression.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCLExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCLHelperImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCLHelperImpl.java
index 07a98bb..cc2f975 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCLHelperImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OCLHelperImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OperationCallExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OperationCallExp.java
index d6ef4f0..2f35d2d 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OperationCallExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OppositePropertyCallExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OppositePropertyCallExp.java
index bac42b5..4217565 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OppositePropertyCallExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OppositePropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OrderedSetType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OrderedSetType.java
index 78e48e4..34f145e 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OrderedSetType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/OrderedSetType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PrimitiveLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PrimitiveLiteralExp.java
index 4e22582..1113a05 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PrimitiveLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PrimitiveLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PrimitiveType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PrimitiveType.java
index 7203c45..7d33ca0 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PrimitiveType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PrimitiveType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PropertyCallExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PropertyCallExp.java
index b2b71f1..af62e7c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PropertyCallExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/PropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/QueryImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/QueryImpl.java
index 157351f..11eb69c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/QueryImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/QueryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Borland Software Corporation, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/RealLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/RealLiteralExp.java
index c632a01..264363a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/RealLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/RealLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SendSignalAction.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SendSignalAction.java
index 7f8f979..d96b92b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SendSignalAction.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SendSignalAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SequenceType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SequenceType.java
index 97df931..c821644 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SequenceType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SequenceType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SetType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SetType.java
index 7b43390..a0807c1 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SetType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/SetType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/StateExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/StateExp.java
index a3d64c9..9c08c67 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/StateExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/StateExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/StringLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/StringLiteralExp.java
index a2e446f..18ad01e 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/StringLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/StringLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TemplateParameterType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TemplateParameterType.java
index a350033..59db0c2 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TemplateParameterType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TemplateParameterType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleLiteralExp.java
index bbbb26e..b2ee064 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleLiteralPart.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleLiteralPart.java
index 2f4662d..78206f7 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleLiteralPart.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleLiteralPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleType.java
index e604431..c8f8afc 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TupleType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TypeExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TypeExp.java
index bb21708..a8ecbdf 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TypeExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TypeExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TypeType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TypeType.java
index 0dd5550..8718a7c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TypeType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/TypeType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/UnlimitedNaturalLiteralExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/UnlimitedNaturalLiteralExp.java
index 8955dd5..d5df31b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/UnlimitedNaturalLiteralExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/UnlimitedNaturalLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/UnspecifiedValueExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/UnspecifiedValueExp.java
index 3e97ad3..f752922 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/UnspecifiedValueExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/UnspecifiedValueExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/Variable.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/Variable.java
index 628c104..a6c03b2 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/Variable.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/Variable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/VariableExp.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/VariableExp.java
index 8f9858e..0301548 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/VariableExp.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/VariableExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/VoidType.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/VoidType.java
index 6187c42..de49332 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/VoidType.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/VoidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractDelegatedBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractDelegatedBehavior.java
index 94bcae0..e568e18 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractDelegatedBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractDelegatedBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractOCLDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractOCLDelegateFactory.java
index adcf78a..c107fb8 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractOCLDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/AbstractOCLDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateDomain.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateDomain.java
index 5e2f4ec..3a12b19 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateDomain.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateDomain.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEClassifierAdapter.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEClassifierAdapter.java
index 870198a..be016b9 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEClassifierAdapter.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEClassifierAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEPackageAdapter.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEPackageAdapter.java
index deccea8..7486bdd 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEPackageAdapter.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateEPackageAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateResourceAdapter.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateResourceAdapter.java
index 93a4a04..48646b0 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateResourceAdapter.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateResourceAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateResourceSetAdapter.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateResourceSetAdapter.java
index 9ac453b..cb7b2a6 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateResourceSetAdapter.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegateResourceSetAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegatedBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegatedBehavior.java
index e8811b1..4d00797 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegatedBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/DelegatedBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/InvocationBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/InvocationBehavior.java
index 1d204d9..8f86b82 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/InvocationBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/InvocationBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomain.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomain.java
index 4b5af5d..c157520 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomain.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomain.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomainFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomainFactory.java
index 1cd28b0..f29383c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomainFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateDomainFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateException.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateException.java
index 030eb28..d654d42 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateException.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLDelegateException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegate.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegate.java
index 0674bd5..67b6f02 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegate.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegateFactory.java
index b54b006..d05e1a7 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLInvocationDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegate.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegate.java
index 8a7e0b4..0cb7cf3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegate.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Kenn Hussey 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Kenn Hussey - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegateFactory.java
index 40cf043..10d0379 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLQueryDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Kenn Hussey 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Kenn Hussey - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegate.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegate.java
index fd208cf..10cc073 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegate.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegateFactory.java
index 8b16069..a92f2dd 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLSettingDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegate.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegate.java
index 2885ad5..6e98b8a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegate.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegateFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegateFactory.java
index 062f000..084208f 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/OCLValidationDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/SettingBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/SettingBehavior.java
index dc9ff2e..29b3ed0 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/SettingBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/SettingBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationBehavior.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationBehavior.java
index dca9bbb..794ca14 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationBehavior.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationDelegate.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationDelegate.java
index c6aa2b5..1909796 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationDelegate.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValidationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValueConverter.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValueConverter.java
index 41ccc1f..842f806 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValueConverter.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/delegate/ValueConverter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/AnyTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/AnyTypeImpl.java
index a08aa5d..4675da9 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/AnyTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/AnyTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/AssociationClassCallExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/AssociationClassCallExpImpl.java
index cf4a417..ecfa530 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/AssociationClassCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/AssociationClassCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/BagTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/BagTypeImpl.java
index 722f613..655e755 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/BagTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/BagTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/BooleanLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/BooleanLiteralExpImpl.java
index 3295ff7..d2530e6 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/BooleanLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/BooleanLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CallExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CallExpImpl.java
index 685d742..1e6f65f 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CallExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CallOperationActionImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CallOperationActionImpl.java
index 01679fd..d16d3d4 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CallOperationActionImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CallOperationActionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionItemImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionItemImpl.java
index 6ef8d52..ffda39c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionItemImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionItemImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionLiteralExpImpl.java
index 5c1a7fc..bc228fc 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionLiteralPartImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionLiteralPartImpl.java
index ae8743a..f15efce 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionRangeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionRangeImpl.java
index 22e4548..7b29546 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionRangeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionRangeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionTypeImpl.java
index 93d50f0..0aff2b7 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/CollectionTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ConstraintImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ConstraintImpl.java
index 7059791..bfef55a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ConstraintImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ConstraintImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EcoreFactoryImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EcoreFactoryImpl.java
index a61e10e..8461056 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EcoreFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EcoreFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EcorePackageImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EcorePackageImpl.java
index 14e8e46..6016a9c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EcorePackageImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EcorePackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ElementTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ElementTypeImpl.java
index 36a5f9c..09ce7fb 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ElementTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ElementTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EnumLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EnumLiteralExpImpl.java
index a01123a..2d55a92 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EnumLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/EnumLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ExpressionInOCLImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ExpressionInOCLImpl.java
index f8334bc..42c0c54 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ExpressionInOCLImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/ExpressionInOCLImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/FeatureCallExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/FeatureCallExpImpl.java
index fcd84b4..5136f51 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/FeatureCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/FeatureCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IfExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IfExpImpl.java
index 1d4c429..4880202 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IfExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IfExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IntegerLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IntegerLiteralExpImpl.java
index f61e284..d7e144a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IntegerLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IntegerLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/InvalidLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/InvalidLiteralExpImpl.java
index 7f73bb3..758f78a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/InvalidLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/InvalidLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/InvalidTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/InvalidTypeImpl.java
index b7c2915..d2993dd 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/InvalidTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/InvalidTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IterateExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IterateExpImpl.java
index 6b44682..a5ff459 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IterateExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IterateExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IteratorExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IteratorExpImpl.java
index 913c7e1..d2e5a8e 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IteratorExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/IteratorExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LetExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LetExpImpl.java
index e5d2b82..9cc0176 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LetExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LetExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LiteralExpImpl.java
index 017ddf2..4284cf3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LoopExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LoopExpImpl.java
index 13b0869..f61bbb7 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LoopExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/LoopExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/MessageExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/MessageExpImpl.java
index e4f2380..d8a64cf 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/MessageExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/MessageExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/MessageTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/MessageTypeImpl.java
index 15bc097..7aa1b33 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/MessageTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/MessageTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NavigationCallExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NavigationCallExpImpl.java
index e0f89e0..496b79c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NavigationCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NavigationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NullLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NullLiteralExpImpl.java
index fb96060..e410b36 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NullLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NullLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NumericLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NumericLiteralExpImpl.java
index ef3a565..f4c4d1a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NumericLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/NumericLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OCLExpressionImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OCLExpressionImpl.java
index ba49ebd..75706bf 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OCLExpressionImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OCLExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OperationCallExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OperationCallExpImpl.java
index 0e20579..acd8537 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OperationCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OppositePropertyCallExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OppositePropertyCallExpImpl.java
index ea35ff5..8d92ac9 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OppositePropertyCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OppositePropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OrderedSetTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OrderedSetTypeImpl.java
index e9c51aa..25413a6 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OrderedSetTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/OrderedSetTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PrimitiveLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PrimitiveLiteralExpImpl.java
index 0c73698..c591ffb 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PrimitiveLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PrimitiveLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PrimitiveTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PrimitiveTypeImpl.java
index c9c27be..b75e423 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PrimitiveTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PrimitiveTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PropertyCallExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PropertyCallExpImpl.java
index 5715eb4..795a19a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PropertyCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/PropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/RealLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/RealLiteralExpImpl.java
index 6ec6599..74bec7e 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/RealLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/RealLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SendSignalActionImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SendSignalActionImpl.java
index 1a845fe..a300d33 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SendSignalActionImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SendSignalActionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SequenceTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SequenceTypeImpl.java
index 6d595ad..238d5d0 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SequenceTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SequenceTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SetTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SetTypeImpl.java
index bf7753c..bdb30e9 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SetTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/SetTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/StateExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/StateExpImpl.java
index c5a5301..99c9c6c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/StateExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/StateExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/StringLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/StringLiteralExpImpl.java
index 6216af5..31cd7d4 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/StringLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/StringLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TemplateParameterTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TemplateParameterTypeImpl.java
index a28d748..3e986f5 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TemplateParameterTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TemplateParameterTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleLiteralExpImpl.java
index 146947a..70eda0a 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleLiteralPartImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleLiteralPartImpl.java
index 363e3c2..1d7a58b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleTypeImpl.java
index c7b0003..15aba0e 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TupleTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TypeExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TypeExpImpl.java
index 76cc35e..7c3a5c2 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TypeExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TypeExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TypeTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TypeTypeImpl.java
index dee4f6f..3c872f5 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TypeTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/TypeTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/UnlimitedNaturalLiteralExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/UnlimitedNaturalLiteralExpImpl.java
index 0bded75..b7b7eb4 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/UnlimitedNaturalLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/UnlimitedNaturalLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/UnspecifiedValueExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/UnspecifiedValueExpImpl.java
index d622cf2..b6731ee 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/UnspecifiedValueExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/UnspecifiedValueExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VariableExpImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VariableExpImpl.java
index e0724e0..a81b309 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VariableExpImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VariableExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VariableImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VariableImpl.java
index 96df942..9f96dda 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VariableImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VoidTypeImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VoidTypeImpl.java
index 52e9f60..1767078 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VoidTypeImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/VoidTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/package.html b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/package.html
index 1456d76..84bd9f1 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/package.html
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/impl/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/EcoreForeignMethods.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/EcoreForeignMethods.java
index 7f80730..23bec10 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/EcoreForeignMethods.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/EcoreForeignMethods.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLDebugOptions.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLDebugOptions.java
index e3f673e..66734c7 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLDebugOptions.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLDebugOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLEcorePlugin.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLEcorePlugin.java
index f197a70..7057bea 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLEcorePlugin.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLEcorePlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLFactoryImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLFactoryImpl.java
index ac611a1..c5ca962 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLStandardLibraryImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLStandardLibraryImpl.java
index 27a6657..dfce063 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLStandardLibraryImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLStandardLibraryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012, 2011 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLStatusCodes.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLStatusCodes.java
index 2572170..cbae5b8 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLStatusCodes.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/OCLStatusCodes.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/TypeResolverImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/TypeResolverImpl.java
index f965974..8865f83 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/TypeResolverImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/TypeResolverImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/UMLReflectionImpl.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/UMLReflectionImpl.java
index 2c1fb1b..e0510a1 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/UMLReflectionImpl.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/UMLReflectionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/evaluation/TracingEvaluationVisitor.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/evaluation/TracingEvaluationVisitor.java
index f0ab231..0e85e3b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/evaluation/TracingEvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/evaluation/TracingEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/helper/OCLSyntaxHelper.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/helper/OCLSyntaxHelper.java
index da73ed3..4b1dd07 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/helper/OCLSyntaxHelper.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/internal/helper/OCLSyntaxHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/AllInstancesContentAdapter.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/AllInstancesContentAdapter.java
index 9552f60..290e2cd 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/AllInstancesContentAdapter.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/AllInstancesContentAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2010 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/DefaultOppositeEndFinder.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/DefaultOppositeEndFinder.java
index d71283c..db7cc0f 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/DefaultOppositeEndFinder.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/DefaultOppositeEndFinder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/EcoreEnvironmentFactoryWithHiddenOpposites.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/EcoreEnvironmentFactoryWithHiddenOpposites.java
index c14fa7d..1c7c795 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/EcoreEnvironmentFactoryWithHiddenOpposites.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/EcoreEnvironmentFactoryWithHiddenOpposites.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/ExtentMap.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/ExtentMap.java
index a2c3218..0bb1a04 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/ExtentMap.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/ExtentMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/OppositeEndFinder.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/OppositeEndFinder.java
index e86c010..40438b8 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/OppositeEndFinder.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/opposites/OppositeEndFinder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/package.html b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/package.html
index 861d8e3..7b61d70 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/package.html
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/OCLAnalyzer.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/OCLAnalyzer.java
index 76f681a..ff0f5b3 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/OCLAnalyzer.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/OCLAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/OCLFactoryWithHistory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/OCLFactoryWithHistory.java
index 0d10036..51daa43 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/OCLFactoryWithHistory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/OCLFactoryWithHistory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/ValidationVisitor.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/ValidationVisitor.java
index 542dd65..2286b0b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/ValidationVisitor.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/parser/ValidationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreAdapterFactory.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreAdapterFactory.java
index b5b1643..1fe0b4b 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2011 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreSwitch.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreSwitch.java
index a945d45..4915e57 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreSwitch.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreValidator.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreValidator.java
index 3adb6b9..c408fe9 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreValidator.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/EcoreValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/OCLEcoreUtil.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/OCLEcoreUtil.java
index 1b36555..ad27df1 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/OCLEcoreUtil.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/OCLEcoreUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/package.html b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/package.html
index 4690c1f..39d6586 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/package.html
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/util/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/AbstractVisitor.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/AbstractVisitor.java
index 02c975f..e84ad85 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/AbstractVisitor.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/AbstractVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/OCLFactoryWithHiddenOpposite.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/OCLFactoryWithHiddenOpposite.java
index b8b0ec3..0d9cf0c 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/OCLFactoryWithHiddenOpposite.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/OCLFactoryWithHiddenOpposite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2010 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/ToStringVisitor.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/ToStringVisitor.java
index 80ed0e9..eb0de77 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/ToStringVisitor.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/ToStringVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/VisitorExtension.java b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/VisitorExtension.java
index 10f0fb5..1ab6c20 100644
--- a/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/VisitorExtension.java
+++ b/plugins/org.eclipse.ocl.ecore/src/org/eclipse/ocl/ecore/utilities/VisitorExtension.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/about.html b/plugins/org.eclipse.ocl.edit/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.edit/about.html
+++ b/plugins/org.eclipse.ocl.edit/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.edit/about.properties b/plugins/org.eclipse.ocl.edit/about.properties
index 8eb47bd..631da99 100644
--- a/plugins/org.eclipse.ocl.edit/about.properties
+++ b/plugins/org.eclipse.ocl.edit/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2014 Open Canarias S.L., 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Open Canarias) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/build.properties b/plugins/org.eclipse.ocl.edit/build.properties
index bfe81d6..2f30445 100644
--- a/plugins/org.eclipse.ocl.edit/build.properties
+++ b/plugins/org.eclipse.ocl.edit/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/plugin.properties b/plugins/org.eclipse.ocl.edit/plugin.properties
index 847c78a..4d992be 100644
--- a/plugins/org.eclipse.ocl.edit/plugin.properties
+++ b/plugins/org.eclipse.ocl.edit/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/plugin.xml b/plugins/org.eclipse.ocl.edit/plugin.xml
index e58502c..347bed6 100644
--- a/plugins/org.eclipse.ocl.edit/plugin.xml
+++ b/plugins/org.eclipse.ocl.edit/plugin.xml
@@ -4,9 +4,9 @@
 <!--
  Copyright (c) 2009 Willink Transformations 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 v2.0
  which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
 
  Contributors:
    E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/edit/OCLEditPlugin.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/edit/OCLEditPlugin.java
index 33770ed..84029db 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/edit/OCLEditPlugin.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/edit/OCLEditPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/AssociationClassCallExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/AssociationClassCallExpItemProvider.java
index 81db410..e8f74bf 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/AssociationClassCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/AssociationClassCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/BooleanLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/BooleanLiteralExpItemProvider.java
index c520bc1..dcd51cc 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/BooleanLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/BooleanLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CallExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CallExpItemProvider.java
index 3779e89..4d092f2 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionItemItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionItemItemProvider.java
index 1e32b9f..60022ba 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionItemItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionItemItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionLiteralExpItemProvider.java
index 1239d87..08bb8eb 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionLiteralPartItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionLiteralPartItemProvider.java
index 4b2924e..9844477 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionLiteralPartItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionLiteralPartItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionRangeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionRangeItemProvider.java
index 511ceb4..acf0fe6 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionRangeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/CollectionRangeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/EnumLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/EnumLiteralExpItemProvider.java
index e54c604..7349783 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/EnumLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/EnumLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/ExpressionsItemProviderAdapterFactory.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/ExpressionsItemProviderAdapterFactory.java
index d272dc1..dc2fb0c 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/ExpressionsItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/ExpressionsItemProviderAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/FeatureCallExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/FeatureCallExpItemProvider.java
index 473a361..eae208c 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/FeatureCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/FeatureCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IfExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IfExpItemProvider.java
index 8879242..b2596ad 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IfExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IfExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IntegerLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IntegerLiteralExpItemProvider.java
index ba12c39..2731f4f 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IntegerLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IntegerLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/InvalidLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/InvalidLiteralExpItemProvider.java
index 02f2649..6646dfe 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/InvalidLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/InvalidLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IterateExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IterateExpItemProvider.java
index 5723ecb..12bde85 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IterateExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IterateExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IteratorExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IteratorExpItemProvider.java
index c89c3b9..18d9186 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IteratorExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/IteratorExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LetExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LetExpItemProvider.java
index d072021..0fe96d7 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LetExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LetExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LiteralExpItemProvider.java
index 64aa6b8..3b87ffe 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LoopExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LoopExpItemProvider.java
index 44bf7a2..3d9ed25 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LoopExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/LoopExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/MessageExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/MessageExpItemProvider.java
index 4d35883..5cfac9c 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/MessageExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/MessageExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NavigationCallExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NavigationCallExpItemProvider.java
index 430e8ed..d425a53 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NavigationCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NavigationCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NullLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NullLiteralExpItemProvider.java
index f1236ab..9c9c74a 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NullLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NullLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NumericLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NumericLiteralExpItemProvider.java
index 63aa736..e22c0b4 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NumericLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/NumericLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/OCLExpressionItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/OCLExpressionItemProvider.java
index b448ff8..f88a2e9 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/OCLExpressionItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/OCLExpressionItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/OperationCallExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/OperationCallExpItemProvider.java
index 97fba5d..250339b 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/OperationCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/OperationCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/PrimitiveLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/PrimitiveLiteralExpItemProvider.java
index cee96a7..a9729d6 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/PrimitiveLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/PrimitiveLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/PropertyCallExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/PropertyCallExpItemProvider.java
index e4ad966..fad84c0 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/PropertyCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/PropertyCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/RealLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/RealLiteralExpItemProvider.java
index 7674ddf..2bf8abe 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/RealLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/RealLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/StateExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/StateExpItemProvider.java
index e3d4193..66cbe39 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/StateExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/StateExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/StringLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/StringLiteralExpItemProvider.java
index 72be0cc..54f9768 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/StringLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/StringLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TupleLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TupleLiteralExpItemProvider.java
index 0331a12..2e0bcce 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TupleLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TupleLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TupleLiteralPartItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TupleLiteralPartItemProvider.java
index 7b00f42..eed870c 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TupleLiteralPartItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TupleLiteralPartItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TypeExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TypeExpItemProvider.java
index c84ba27..26cac2a 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TypeExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/TypeExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/UnlimitedNaturalLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/UnlimitedNaturalLiteralExpItemProvider.java
index 800bcb0..c78e118 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/UnlimitedNaturalLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/UnlimitedNaturalLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/UnspecifiedValueExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/UnspecifiedValueExpItemProvider.java
index bb05bc1..7c2d6ec 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/UnspecifiedValueExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/UnspecifiedValueExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/VariableExpItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/VariableExpItemProvider.java
index 01c9c04..c1cc4ab 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/VariableExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/VariableExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/VariableItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/VariableItemProvider.java
index d1b9012..505ddaa 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/VariableItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/expressions/provider/VariableItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/AnyTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/AnyTypeItemProvider.java
index a3bc5ce..0bbed71 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/AnyTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/AnyTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/BagTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/BagTypeItemProvider.java
index 8ce0a6e..bc57b19 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/BagTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/BagTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/CollectionTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/CollectionTypeItemProvider.java
index 4e81a0d..5e8f44e 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/CollectionTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/CollectionTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/ElementTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/ElementTypeItemProvider.java
index db81ae5..0de9d1f 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/ElementTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/ElementTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/InvalidTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/InvalidTypeItemProvider.java
index 9a96cbb..28295ac 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/InvalidTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/InvalidTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/MessageTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/MessageTypeItemProvider.java
index 787d641..f03f848 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/MessageTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/MessageTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/OrderedSetTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/OrderedSetTypeItemProvider.java
index 028d161..415889c 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/OrderedSetTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/OrderedSetTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/PrimitiveTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/PrimitiveTypeItemProvider.java
index 6861954..a7d7f2f 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/PrimitiveTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/PrimitiveTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/SequenceTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/SequenceTypeItemProvider.java
index 8c5e4d2..c6e7e08 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/SequenceTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/SequenceTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/SetTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/SetTypeItemProvider.java
index b61ac57..f1dd995 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/SetTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/SetTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TemplateParameterTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TemplateParameterTypeItemProvider.java
index 6a04184..4b2a5e7 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TemplateParameterTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TemplateParameterTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TupleTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TupleTypeItemProvider.java
index ed6bfda..3ed78d9 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TupleTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TupleTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TypeTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TypeTypeItemProvider.java
index cb986cb..21ab84f 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TypeTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TypeTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TypesItemProviderAdapterFactory.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TypesItemProviderAdapterFactory.java
index cd274a7..fc93c27 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/TypesItemProviderAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/VoidTypeItemProvider.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/VoidTypeItemProvider.java
index a9479a9..683646b 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/VoidTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/types/provider/VoidTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/utilities/provider/UtilitiesItemProviderAdapterFactory.java b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/utilities/provider/UtilitiesItemProviderAdapterFactory.java
index ab9193d..319c95d 100644
--- a/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/utilities/provider/UtilitiesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.edit/src/org/eclipse/ocl/utilities/provider/UtilitiesItemProviderAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.master/about.html b/plugins/org.eclipse.ocl.master/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.master/about.html
+++ b/plugins/org.eclipse.ocl.master/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.master/about.properties b/plugins/org.eclipse.ocl.master/about.properties
index ac722f2..80034a9 100644
--- a/plugins/org.eclipse.ocl.master/about.properties
+++ b/plugins/org.eclipse.ocl.master/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.master/build.properties b/plugins/org.eclipse.ocl.master/build.properties
index 20ea58a..1603ab6 100644
--- a/plugins/org.eclipse.ocl.master/build.properties
+++ b/plugins/org.eclipse.ocl.master/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.master/plugin.properties b/plugins/org.eclipse.ocl.master/plugin.properties
index 4d3aa39..bb70bf6 100644
--- a/plugins/org.eclipse.ocl.master/plugin.properties
+++ b/plugins/org.eclipse.ocl.master/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.ui/about.html b/plugins/org.eclipse.ocl.pivot.ui/about.html
index 8d72b76..f366e1a 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/about.html
+++ b/plugins/org.eclipse.ocl.pivot.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.pivot.ui/build.properties b/plugins/org.eclipse.ocl.pivot.ui/build.properties
index 99812f6..f9e6489 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/build.properties
+++ b/plugins/org.eclipse.ocl.pivot.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.ui/plugin.properties b/plugins/org.eclipse.ocl.pivot.ui/plugin.properties
index fc53988..f0e2fc1 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.pivot.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/OCLUI.java b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/OCLUI.java
index 6444cf9..5f6f1f8 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/OCLUI.java
+++ b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/OCLUI.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/builder/OCLBuilder.java b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/builder/OCLBuilder.java
index bd98665..7bdde7e 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/builder/OCLBuilder.java
+++ b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/builder/OCLBuilder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.builder.nature.XtextNature
diff --git a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/internal/preferences/PivotProjectPreferencePage.java b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/internal/preferences/PivotProjectPreferencePage.java
index 741cbf9..9d238d3 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/internal/preferences/PivotProjectPreferencePage.java
+++ b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/internal/preferences/PivotProjectPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/messages/PivotUIMessages.java b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/messages/PivotUIMessages.java
index 4a824a3..6cb5a45 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/messages/PivotUIMessages.java
+++ b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/messages/PivotUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/messages/PivotUIMessages.properties b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/messages/PivotUIMessages.properties
index ba3626f..cc299df 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/messages/PivotUIMessages.properties
+++ b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/messages/PivotUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/nature/OCLNature.java b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/nature/OCLNature.java
index 013d053..276b502 100644
--- a/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/nature/OCLNature.java
+++ b/plugins/org.eclipse.ocl.pivot.ui/src/org/eclipse/ocl/pivot/ui/nature/OCLNature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.builder.nature.XtextNature
diff --git a/plugins/org.eclipse.ocl.pivot.uml/about.html b/plugins/org.eclipse.ocl.pivot.uml/about.html
index 8d72b76..f366e1a 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/about.html
+++ b/plugins/org.eclipse.ocl.pivot.uml/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.pivot.uml/build.properties b/plugins/org.eclipse.ocl.pivot.uml/build.properties
index dbded3f..3d5138b 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/build.properties
+++ b/plugins/org.eclipse.ocl.pivot.uml/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/PivotUMLPlugin.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/PivotUMLPlugin.java
index 49b597e..3468abd 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/PivotUMLPlugin.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/PivotUMLPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/BoundedInteger.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/BoundedInteger.java
index 27b7d1d..18ea527 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/BoundedInteger.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/BoundedInteger.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Collection.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Collection.java
index 43259b9..80bc902 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Collection.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Collection.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Collections.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Collections.java
index ae04f4c..955793e 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Collections.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Collections.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/FixedPoint.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/FixedPoint.java
index fbc99b9..907d9da 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/FixedPoint.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/FixedPoint.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/FloatingPoint.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/FloatingPoint.java
index 64dcd0c..a3d9b21 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/FloatingPoint.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/FloatingPoint.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Integer.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Integer.java
index 32a1067..6bf9f22 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Integer.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Integer.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/OCLforUMLFactory.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/OCLforUMLFactory.java
index 2fbaa2e..2ef8862 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/OCLforUMLFactory.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/OCLforUMLFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/OCLforUMLPackage.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/OCLforUMLPackage.java
index e41884f..a02390a 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/OCLforUMLPackage.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/OCLforUMLPackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Overflow.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Overflow.java
index 11a1d60..2fabc32 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Overflow.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Overflow.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Real.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Real.java
index 74f6280..96311df 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Real.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Real.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Rounding.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Rounding.java
index 45dcb92..b8da431 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Rounding.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Rounding.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Validation.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Validation.java
index 3b22830..fbd3c2b 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Validation.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Validation.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Validations.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Validations.java
index 9edde0c..0754468 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Validations.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/Validations.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/BoundedIntegerImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/BoundedIntegerImpl.java
index 78fc999..8075133 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/BoundedIntegerImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/BoundedIntegerImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/CollectionImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/CollectionImpl.java
index 8da3900..2a8c6c7 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/CollectionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/CollectionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/CollectionsImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/CollectionsImpl.java
index a6e2931..4172a50 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/CollectionsImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/CollectionsImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/FixedPointImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/FixedPointImpl.java
index b6a4951..fb66749 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/FixedPointImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/FixedPointImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/FloatingPointImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/FloatingPointImpl.java
index 86c2215..221122b 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/FloatingPointImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/FloatingPointImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/IntegerImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/IntegerImpl.java
index a87e471..8a6142d 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/IntegerImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/IntegerImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/OCLforUMLFactoryImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/OCLforUMLFactoryImpl.java
index ec8b3d7..60137a1 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/OCLforUMLFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/OCLforUMLFactoryImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/OCLforUMLPackageImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/OCLforUMLPackageImpl.java
index 819412f..00a9e38 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/OCLforUMLPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/OCLforUMLPackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/RealImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/RealImpl.java
index ae75620..256d472 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/RealImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/RealImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/ValidationImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/ValidationImpl.java
index f6787a5..c253e34 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/ValidationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/ValidationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/ValidationsImpl.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/ValidationsImpl.java
index 23b668e..e57e227 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/ValidationsImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/impl/ValidationsImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/util/OCLforUMLAdapterFactory.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/util/OCLforUMLAdapterFactory.java
index 952e72c..dd4e7aa 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/util/OCLforUMLAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/util/OCLforUMLAdapterFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/util/OCLforUMLSwitch.java b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/util/OCLforUMLSwitch.java
index ac98dbd..467aac8 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/util/OCLforUMLSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/emf-gen/org/eclipse/ocl/pivot/uml/internal/oclforuml/util/OCLforUMLSwitch.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/model/OCLforUML.profile.genmodel b/plugins/org.eclipse.ocl.pivot.uml/model/OCLforUML.profile.genmodel
index 4081586..d5f7fd1 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/model/OCLforUML.profile.genmodel
+++ b/plugins/org.eclipse.ocl.pivot.uml/model/OCLforUML.profile.genmodel
@@ -1,5 +1,5 @@
 <?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) 2015, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation" modelDirectory="/org.eclipse.ocl.pivot.uml/emf-gen" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.ocl.pivot.uml" runtimeJar="true" modelName="OCLforUML" modelPluginClass="org.eclipse.ocl.pivot.uml.PivotUMLPlugin" updateClasspath="false" nonNLSMarkers="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.uml2.uml.ecore.importer" bundleManifest="false" containmentProxies="true" complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7" operationReflection="true" pluginKey="" invariantPrefix="validate">

+<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) 2015, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation" modelDirectory="/org.eclipse.ocl.pivot.uml/emf-gen" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.ocl.pivot.uml" runtimeJar="true" modelName="OCLforUML" modelPluginClass="org.eclipse.ocl.pivot.uml.PivotUMLPlugin" updateClasspath="false" nonNLSMarkers="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.uml2.uml.ecore.importer" bundleManifest="false" containmentProxies="true" complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7" operationReflection="true" pluginKey="" invariantPrefix="validate">

   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">

     <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>

     <details key="UNION_PROPERTIES" value="PROCESS"/>

diff --git a/plugins/org.eclipse.ocl.pivot.uml/plugin.properties b/plugins/org.eclipse.ocl.pivot.uml/plugin.properties
index acd058b..107e428 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/plugin.properties
+++ b/plugins/org.eclipse.ocl.pivot.uml/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/UMLOCL.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/UMLOCL.java
index 8a912a5..0adf99b 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/UMLOCL.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/UMLOCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/UMLStandaloneSetup.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/UMLStandaloneSetup.java
index ab274b6..cf23bc5 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/UMLStandaloneSetup.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/UMLStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UML.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UML.java
index b53d951..a101209 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UML.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UML.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UMLDeclarationVisitor.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UMLDeclarationVisitor.java
index 975cc4e..bf2ce3a 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UMLDeclarationVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UMLDeclarationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UMLReferenceVisitor.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UMLReferenceVisitor.java
index 73ea805..d2c909b 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UMLReferenceVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/as2es/AS2UMLReferenceVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/AssociationClassProperties.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/AssociationClassProperties.java
index 165f00c..6454e45 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/AssociationClassProperties.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/AssociationClassProperties.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/ModelAnalysis.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/ModelAnalysis.java
index 837f1f9..fee0b3d 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/ModelAnalysis.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/ModelAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA List) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/ProfileAnalysis.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/ProfileAnalysis.java
index 80a70bc..add81bd 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/ProfileAnalysis.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/ProfileAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA List) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2AS.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2AS.java
index cd9b39a..b4b2af4 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2AS.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASDeclarationSwitch.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASDeclarationSwitch.java
index ce78b4e..9972b20 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASDeclarationSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASDeclarationSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASReferenceSwitch.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASReferenceSwitch.java
index d5319a2..57d70d1 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASReferenceSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASReferenceSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUseSwitch.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUseSwitch.java
index c11257d..930a026 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUseSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUseSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUtil.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUtil.java
index 508dbb0..9113636 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUtil.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/es2as/UML2ASUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA List) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/CommentLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/CommentLabelGenerator.java
index a64231b..dd3ce65 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/CommentLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/CommentLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralBooleanLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralBooleanLabelGenerator.java
index 065e3fb..5a85e3f 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralBooleanLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralBooleanLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralIntegerLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralIntegerLabelGenerator.java
index ea5a926..27b96a1 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralIntegerLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralIntegerLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralNullLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralNullLabelGenerator.java
index ad59d13..6e95b8d 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralNullLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralNullLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralRealLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralRealLabelGenerator.java
index 24ad06a..e67c1e7 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralRealLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralRealLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralStringLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralStringLabelGenerator.java
index 1bd507f..7787907 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralStringLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralStringLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralUnlimitedNaturalLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralUnlimitedNaturalLabelGenerator.java
index fe70109..528bbae 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralUnlimitedNaturalLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/LiteralUnlimitedNaturalLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/NamedElementLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/NamedElementLabelGenerator.java
index 815082d..a0b7745 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/NamedElementLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/NamedElementLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/OpaqueExpressionLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/OpaqueExpressionLabelGenerator.java
index 1d9b4a6..33572f4 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/OpaqueExpressionLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/OpaqueExpressionLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/PackageImportLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/PackageImportLabelGenerator.java
index 70b7458..2e19861 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/PackageImportLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/PackageImportLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/SlotLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/SlotLabelGenerator.java
index b334dc3..826a95c 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/SlotLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/SlotLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/UMLElementExtensionLabelGenerator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/UMLElementExtensionLabelGenerator.java
index fbff517..15cabf6 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/UMLElementExtensionLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/labels/UMLElementExtensionLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/InstanceSlotNavigationProperty.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/InstanceSlotNavigationProperty.java
index 8470475..d400dcc 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/InstanceSlotNavigationProperty.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/InstanceSlotNavigationProperty.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2014, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLBaseProperty.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLBaseProperty.java
index 674ccbb..ba4c622 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLBaseProperty.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLBaseProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLElementExtension.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLElementExtension.java
index db01830..d907c91 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLElementExtension.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLElementExtension.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLExtensionProperty.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLExtensionProperty.java
index bddc2b9..a62be58 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLExtensionProperty.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLExtensionProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLRedefinedNavigationProperty.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLRedefinedNavigationProperty.java
index fd8a0c3..ec79fda 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLRedefinedNavigationProperty.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLRedefinedNavigationProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLStereotypeProperty.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLStereotypeProperty.java
index 1ab41fb..15a0d9c 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLStereotypeProperty.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/library/UMLStereotypeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/messages/UMLPivotMessages.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/messages/UMLPivotMessages.java
index 3c1fc57..1e177fc 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/messages/UMLPivotMessages.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/messages/UMLPivotMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/messages/UMLPivotMessages.properties b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/messages/UMLPivotMessages.properties
index 5d17fe5..8cf8330 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/messages/UMLPivotMessages.properties
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/messages/UMLPivotMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2016 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/resource/UMLASResourceFactory.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/resource/UMLASResourceFactory.java
index f72675d..9b03a3e 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/resource/UMLASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/resource/UMLASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/resource/UMLASResourceImpl.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/resource/UMLASResourceImpl.java
index 55e9b85..7d0b8dd 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/resource/UMLASResourceImpl.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/resource/UMLASResourceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UML2Moniker.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UML2Moniker.java
index 75b7b1c..c1c9987 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UML2Moniker.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UML2Moniker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLEcoreTechnology.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLEcoreTechnology.java
index 0a760b0..0ac411d 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLEcoreTechnology.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLEcoreTechnology.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLIdResolver.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLIdResolver.java
index 32b3ed3..e50f597 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLIdResolver.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLIdResolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLXMIID.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLXMIID.java
index 383e87c..5d1ab00 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLXMIID.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/utilities/UMLXMIID.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/LoadableConstraintDescriptor.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/LoadableConstraintDescriptor.java
index a7512dd..64af560 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/LoadableConstraintDescriptor.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/LoadableConstraintDescriptor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/LoadableConstraintProvider.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/LoadableConstraintProvider.java
index 3184687..3f07ab6 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/LoadableConstraintProvider.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/LoadableConstraintProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/PathConstraintParser.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/PathConstraintParser.java
index 79a22f4..8158a82 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/PathConstraintParser.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/PathConstraintParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/PivotClientSelector.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/PivotClientSelector.java
index 6d527dc..692f4a7 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/PivotClientSelector.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/PivotClientSelector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLOCLEValidator.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLOCLEValidator.java
index 9335074..6d8be41 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLOCLEValidator.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLOCLEValidator.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2014, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLProfileConstraintProvider.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLProfileConstraintProvider.java
index 34f8b09..94d2d91 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLProfileConstraintProvider.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLProfileConstraintProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLTraversalStrategy.java b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLTraversalStrategy.java
index 054d43c..f88cb55 100644
--- a/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLTraversalStrategy.java
+++ b/plugins/org.eclipse.ocl.pivot.uml/src/org/eclipse/ocl/pivot/uml/internal/validation/UMLTraversalStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/about.html b/plugins/org.eclipse.ocl.pivot/about.html
index 8d72b76..f366e1a 100644
--- a/plugins/org.eclipse.ocl.pivot/about.html
+++ b/plugins/org.eclipse.ocl.pivot/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.pivot/about.properties b/plugins/org.eclipse.ocl.pivot/about.properties
index c837f8e..9c14fef 100644
--- a/plugins/org.eclipse.ocl.pivot/about.properties
+++ b/plugins/org.eclipse.ocl.pivot/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/build.properties b/plugins/org.eclipse.ocl.pivot/build.properties
index 49e6b1e..9615144 100644
--- a/plugins/org.eclipse.ocl.pivot/build.properties
+++ b/plugins/org.eclipse.ocl.pivot/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Annotation.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Annotation.java
index 8865687..0e2f24a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Annotation.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Annotation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AnyType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AnyType.java
index 99c966c..6ef5bbf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AnyType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AnyType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationClass.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationClass.java
index 9571b5a..c4d4569 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationClass.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationClass.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationClassCallExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationClassCallExp.java
index 692e166..a25bcb2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationClassCallExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationClassCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationKind.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationKind.java
index 316da08..cbf36f0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationKind.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociationKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociativityKind.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociativityKind.java
index 4d00df1..ff1af3f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociativityKind.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/AssociativityKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/BagType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/BagType.java
index f877677..3ec7842 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/BagType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/BagType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Behavior.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Behavior.java
index 2c51f55..c75f23c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Behavior.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Behavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/BooleanLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/BooleanLiteralExp.java
index d4f9e7d..501f3bd 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/BooleanLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/BooleanLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CallExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CallExp.java
index e7e0e96..ea8f8cc 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CallExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CallOperationAction.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CallOperationAction.java
index 3546d11..8c1a855 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CallOperationAction.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CallOperationAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Class.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Class.java
index a8409a2..75726a8 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Class.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Class.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionItem.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionItem.java
index 733adad..5295efc 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionItem.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionItem.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionKind.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionKind.java
index 4cef26a..6e82f77 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionKind.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionLiteralExp.java
index dfb3a0c..f36a196 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionLiteralPart.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionLiteralPart.java
index a587523..c6031d1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionLiteralPart.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionLiteralPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionRange.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionRange.java
index c37ba48..ca717d5 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionRange.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionRange.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionType.java
index 45257c3..5a88972 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CollectionType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Comment.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Comment.java
index 1557034..66a0abf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Comment.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Comment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteClass.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteClass.java
index 31b315f..4e62099 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteClass.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteClass.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteEnvironment.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteEnvironment.java
index c5bc905..2c94e1a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteEnvironment.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteEnvironment.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteModel.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteModel.java
index 945072f..d751804 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteModel.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompleteModel.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompletePackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompletePackage.java
index f407f5c..4e9c440 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompletePackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/CompletePackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ConnectionPointReference.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ConnectionPointReference.java
index 988dd4f..80cf640 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ConnectionPointReference.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ConnectionPointReference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Constraint.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Constraint.java
index 4038c49..98b0cec 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Constraint.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Constraint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DataType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DataType.java
index 2532fb5..1e47392 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DataType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DataType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Detail.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Detail.java
index e1c8b99..cee2c38 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Detail.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Detail.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicBehavior.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicBehavior.java
index 826bfc8..a9b438b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicBehavior.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicBehavior.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicElement.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicElement.java
index c773d22..52627b1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicElement.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicProperty.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicProperty.java
index d2e240b..5e7c717 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicType.java
index 39e6c77..65bad6c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicValueSpecification.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicValueSpecification.java
index d9aaf27..528b9b5 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicValueSpecification.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/DynamicValueSpecification.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Element.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Element.java
index cb39151..b47299c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Element.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Element.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ElementExtension.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ElementExtension.java
index 543e40a..a15336d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ElementExtension.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ElementExtension.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/EnumLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/EnumLiteralExp.java
index 451c1b6..9d1cc0d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/EnumLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/EnumLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Enumeration.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Enumeration.java
index f4bb35f..2ec1953 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Enumeration.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Enumeration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/EnumerationLiteral.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/EnumerationLiteral.java
index 8a3c92c..ee3574e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/EnumerationLiteral.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/EnumerationLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ExpressionInOCL.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ExpressionInOCL.java
index 11b2534..57c243e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ExpressionInOCL.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ExpressionInOCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Feature.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Feature.java
index 91f409f..c36b9ec 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Feature.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Feature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/FeatureCallExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/FeatureCallExp.java
index 7931621..c30417f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/FeatureCallExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/FeatureCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/FinalState.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/FinalState.java
index 63a1c76..ca7cd69 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/FinalState.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/FinalState.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IfExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IfExp.java
index 40d1f22..9dca867 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IfExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IfExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Import.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Import.java
index 35f3012..11ab488 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Import.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Import.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InstanceSpecification.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InstanceSpecification.java
index 701afe4..948bd72 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InstanceSpecification.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InstanceSpecification.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IntegerLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IntegerLiteralExp.java
index c8b5f05..8835274 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IntegerLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IntegerLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InvalidLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InvalidLiteralExp.java
index 3415fc7..95ba873 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InvalidLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InvalidLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InvalidType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InvalidType.java
index 4ebbeaf..f85ae97 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InvalidType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/InvalidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IterateExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IterateExp.java
index 440fc94..4dc1c81 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IterateExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IterateExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Iteration.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Iteration.java
index 704e2e6..1161f9b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Iteration.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Iteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IteratorExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IteratorExp.java
index 5740621..8d0dac0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IteratorExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IteratorExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IteratorVariable.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IteratorVariable.java
index 306755c..589d00b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IteratorVariable.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/IteratorVariable.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LambdaType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LambdaType.java
index c3016ca..7c6eb82 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LambdaType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LambdaType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LanguageExpression.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LanguageExpression.java
index 9408ed7..aade5f9 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LanguageExpression.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LanguageExpression.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LetExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LetExp.java
index dd9dd4b..cce03ea 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LetExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LetExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LetVariable.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LetVariable.java
index 0378999..91a4b96 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LetVariable.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LetVariable.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Library.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Library.java
index 5779944..3984f22 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Library.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Library.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LiteralExp.java
index 9e8bbda..fa85c7d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LoopExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LoopExp.java
index e2cfeca..8c94085 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LoopExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/LoopExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapLiteralExp.java
index 36c81cf..7a34274 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapLiteralExp.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapLiteralPart.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapLiteralPart.java
index d8e132d..14ecd7a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapLiteralPart.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapLiteralPart.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapType.java
index 0fa2a99..731e1d2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MapType.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MessageExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MessageExp.java
index e4d3619..6b0567d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MessageExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MessageExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MessageType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MessageType.java
index f599259..40e2e9f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MessageType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/MessageType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Model.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Model.java
index 86d97c9..7e9672e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Model.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Model.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NamedElement.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NamedElement.java
index b84ba0d..72bd6f8 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NamedElement.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NamedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Namespace.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Namespace.java
index 75cdeab..f0e13fa 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Namespace.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Namespace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NavigationCallExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NavigationCallExp.java
index 00279ec..8e0ff0b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NavigationCallExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NavigationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NullLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NullLiteralExp.java
index d0681c5..39b9bf2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NullLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NullLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NumericLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NumericLiteralExp.java
index f48f322..8a5a161 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NumericLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/NumericLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OCLExpression.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OCLExpression.java
index 5724611..60a4d10 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OCLExpression.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OCLExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Operation.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Operation.java
index 9f627e2..3ccbe9e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Operation.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Operation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OperationCallExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OperationCallExp.java
index 45bdbbf..868842c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OperationCallExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OppositePropertyCallExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OppositePropertyCallExp.java
index eb5693c..2673341 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OppositePropertyCallExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OppositePropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OrderedSetType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OrderedSetType.java
index 48836d4..5a56175 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OrderedSetType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OrderedSetType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OrphanCompletePackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OrphanCompletePackage.java
index 5826084..d86e2d4 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OrphanCompletePackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/OrphanCompletePackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Package.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Package.java
index cc9db9a..67bc3d6 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Package.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Package.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Parameter.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Parameter.java
index 46316e1..1018181 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Parameter.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Parameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ParameterVariable.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ParameterVariable.java
index 509b3a3..786bc9c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ParameterVariable.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ParameterVariable.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ParentCompletePackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ParentCompletePackage.java
index 0401621..02f7291 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ParentCompletePackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ParentCompletePackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotFactory.java
index 35591f0..1806b3b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotPackage.java
index 60cb8a1..2a75a18 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotTables.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotTables.java
index 7036752..bd0c099 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotTables.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PivotTables.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Precedence.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Precedence.java
index fa4855d..4833e71 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Precedence.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Precedence.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveCompletePackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveCompletePackage.java
index cbb3080..8acd84c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveCompletePackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveCompletePackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveLiteralExp.java
index 1352879..ad8a185 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveType.java
index da890be..4758eca 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PrimitiveType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Profile.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Profile.java
index bfec2e7..e88cbff 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Profile.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Profile.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ProfileApplication.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ProfileApplication.java
index 8a83967..2aaf42c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ProfileApplication.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ProfileApplication.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Property.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Property.java
index 4080cce..ef09315 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Property.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Property.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PropertyCallExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PropertyCallExp.java
index 6b62290..6223360 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PropertyCallExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Pseudostate.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Pseudostate.java
index cd92792..589f936 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Pseudostate.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Pseudostate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PseudostateKind.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PseudostateKind.java
index 5ed54e3..53d2e84 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PseudostateKind.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/PseudostateKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/RealLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/RealLiteralExp.java
index b584bf2..86a4be2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/RealLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/RealLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ReferringElement.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ReferringElement.java
index fbd06f4..4aa8699 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ReferringElement.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ReferringElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Region.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Region.java
index 796b5d7..8d767bf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Region.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Region.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ResultVariable.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ResultVariable.java
index f999c21..e7e5e8f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ResultVariable.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ResultVariable.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SelfType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SelfType.java
index 5083a7f..21389c9 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SelfType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SelfType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SendSignalAction.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SendSignalAction.java
index 591a9bd..212a03f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SendSignalAction.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SendSignalAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SequenceType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SequenceType.java
index cbfc400..2542b16 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SequenceType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SequenceType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SetType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SetType.java
index 807a689..270bf4c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SetType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/SetType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ShadowExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ShadowExp.java
index eb22266..db7e9e5 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ShadowExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ShadowExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ShadowPart.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ShadowPart.java
index 34adf46..f4903cd 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ShadowPart.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ShadowPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Signal.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Signal.java
index cfbc6f1..c135b21 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Signal.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Signal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Slot.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Slot.java
index 5a63861..73be714 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Slot.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Slot.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StandardLibrary.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StandardLibrary.java
index afbdfa4..70ac809 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StandardLibrary.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StandardLibrary.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/State.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/State.java
index fcdcc40..494e6b5 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/State.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/State.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StateExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StateExp.java
index 19915aa..b82f2d1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StateExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StateExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StateMachine.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StateMachine.java
index e20a1e9..b0be6f5 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StateMachine.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StateMachine.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Stereotype.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Stereotype.java
index 1115910..3665d40 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Stereotype.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Stereotype.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StereotypeExtender.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StereotypeExtender.java
index 93709ab..593752f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StereotypeExtender.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StereotypeExtender.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StringLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StringLiteralExp.java
index 07dbce1..55dfc3f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StringLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/StringLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateBinding.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateBinding.java
index d4b9b85..9f16595 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateBinding.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateBinding.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateParameter.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateParameter.java
index 9063a63..869c171 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateParameter.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateParameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateParameterSubstitution.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateParameterSubstitution.java
index 2da5d11..a7027da 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateParameterSubstitution.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateParameterSubstitution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateSignature.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateSignature.java
index dd3596a..f77d827 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateSignature.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateSignature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateableElement.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateableElement.java
index 34a4f92..cac763b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateableElement.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TemplateableElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Transition.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Transition.java
index 376a14d..3674974 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Transition.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Transition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TransitionKind.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TransitionKind.java
index e081f06..ff29150 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TransitionKind.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TransitionKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Trigger.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Trigger.java
index 70dd98a..6f6d07c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Trigger.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Trigger.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleLiteralExp.java
index 6cb6129..26d00ea 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleLiteralPart.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleLiteralPart.java
index 2dcd3ea..53e2194 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleLiteralPart.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleLiteralPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleType.java
index 4370125..28cf152 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TupleType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Type.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Type.java
index 503e59b..5238564 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Type.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Type.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TypeExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TypeExp.java
index 7656dd5..9938df0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TypeExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TypeExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TypedElement.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TypedElement.java
index aee7245..5a9d7a0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TypedElement.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/TypedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/UnlimitedNaturalLiteralExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/UnlimitedNaturalLiteralExp.java
index 340713b..abc4578 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/UnlimitedNaturalLiteralExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/UnlimitedNaturalLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/UnspecifiedValueExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/UnspecifiedValueExp.java
index 9a13d94..e3aa501 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/UnspecifiedValueExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/UnspecifiedValueExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ValueSpecification.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ValueSpecification.java
index 834c01a..442066d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ValueSpecification.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/ValueSpecification.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Variable.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Variable.java
index 6daf5bf..6ddad87 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Variable.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Variable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VariableDeclaration.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VariableDeclaration.java
index 7fb9806..57a853d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VariableDeclaration.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VariableDeclaration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VariableExp.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VariableExp.java
index 0c9b32c..2f6fec3 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VariableExp.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VariableExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Vertex.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Vertex.java
index df86ecd..865f66f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Vertex.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/Vertex.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VoidType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VoidType.java
index a749a63..a8cee4f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VoidType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/VoidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/WildcardType.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/WildcardType.java
index 74047da..a091fde 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/WildcardType.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/WildcardType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/ASLibrary_EPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/ASLibrary_EPackage.java
index 9b7be08..3777eec 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/ASLibrary_EPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/ASLibrary_EPackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/ASMetamodel_EPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/ASMetamodel_EPackage.java
index 6f06711..48aa2c2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/ASMetamodel_EPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/ASMetamodel_EPackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_EClass.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_EClass.java
index bbd173f..cb72bc6 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_EClass.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_EClass.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_EPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_EPackage.java
index f263dc1..94df2cf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_EPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_EPackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_ETypedElement.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_ETypedElement.java
index f2439c4..6fcbe54 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_ETypedElement.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Collection_ETypedElement.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EClassifier.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EClassifier.java
index bad88a4..eca3fa7 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EClassifier.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EClassifier.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EOperation.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EOperation.java
index 406a2b7..331948c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EOperation.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EStructuralFeature.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EStructuralFeature.java
index 518c980..aee60cb 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EStructuralFeature.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Ecore_OCL_EStructuralFeature.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Import_EPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Import_EPackage.java
index 912e2ef..81744ad 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Import_EPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/Import_EPackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/MetaAnnotation_EAnnotation.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/MetaAnnotation_EAnnotation.java
index d37ce8c..5f8fec1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/MetaAnnotation_EAnnotation.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/MetaAnnotation_EAnnotation.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/PivotAnnotationsFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/PivotAnnotationsFactory.java
index 826953d..8c44a0d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/PivotAnnotationsFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/PivotAnnotationsFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/PivotAnnotationsPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/PivotAnnotationsPackage.java
index 9692104..525e478 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/PivotAnnotationsPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/PivotAnnotationsPackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/ASLibrary_EPackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/ASLibrary_EPackageImpl.java
index 6942277..f4e0dfe 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/ASLibrary_EPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/ASLibrary_EPackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/ASMetamodel_EPackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/ASMetamodel_EPackageImpl.java
index 1b101ae..7fd1dd5 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/ASMetamodel_EPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/ASMetamodel_EPackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_EClassImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_EClassImpl.java
index be98747..2f9ea31 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_EClassImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_EClassImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_EPackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_EPackageImpl.java
index 1166fee..a085128 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_EPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_EPackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_ETypedElementImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_ETypedElementImpl.java
index 86ce9d7..b46845e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_ETypedElementImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Collection_ETypedElementImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EClassifierImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EClassifierImpl.java
index f7b8a8a..722f56e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EClassifierImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EClassifierImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EOperationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EOperationImpl.java
index b4cca56..ea2df68 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EOperationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EOperationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EStructuralFeatureImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EStructuralFeatureImpl.java
index c30288f..491d897 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EStructuralFeatureImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Ecore_OCL_EStructuralFeatureImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Import_EPackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Import_EPackageImpl.java
index e28d096..ad1473d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Import_EPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/Import_EPackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/MetaAnnotation_EAnnotationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/MetaAnnotation_EAnnotationImpl.java
index ae173c7..ce0ea03 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/MetaAnnotation_EAnnotationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/MetaAnnotation_EAnnotationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/PivotAnnotationsFactoryImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/PivotAnnotationsFactoryImpl.java
index 76129d9..ef01593 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/PivotAnnotationsFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/PivotAnnotationsFactoryImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/PivotAnnotationsPackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/PivotAnnotationsPackageImpl.java
index 0f26d7e..5c4ddbc 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/PivotAnnotationsPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/impl/PivotAnnotationsPackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/util/PivotAnnotationsAdapterFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/util/PivotAnnotationsAdapterFactory.java
index d6a45c0..e735813 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/util/PivotAnnotationsAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/util/PivotAnnotationsAdapterFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/util/PivotAnnotationsSwitch.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/util/PivotAnnotationsSwitch.java
index 8c1af52..085b33f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/util/PivotAnnotationsSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/annotations/util/PivotAnnotationsSwitch.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AnnotationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AnnotationImpl.java
index 17efdb7..381e8a5 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AnnotationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AnnotationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AnyTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AnyTypeImpl.java
index ea3ebef..de9414f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AnyTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AnyTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AssociationClassCallExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AssociationClassCallExpImpl.java
index 983c868..6457e1b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AssociationClassCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AssociationClassCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AssociationClassImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AssociationClassImpl.java
index 1c7d2f2..ab91bc2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AssociationClassImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/AssociationClassImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BagTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BagTypeImpl.java
index f750030..53a35fe 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BagTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BagTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BehaviorImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BehaviorImpl.java
index e9719b9..ce7dad7 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BehaviorImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BehaviorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BooleanLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BooleanLiteralExpImpl.java
index 0e7f309..beed7e6 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BooleanLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/BooleanLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CallExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CallExpImpl.java
index 294f931..65613ac 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CallExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CallOperationActionImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CallOperationActionImpl.java
index 18c8d0d..5f10ea8 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CallOperationActionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CallOperationActionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ClassImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ClassImpl.java
index 8cb7e30..ba72931 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ClassImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ClassImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionItemImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionItemImpl.java
index 0ad823b..e457e91 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionItemImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionItemImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionLiteralExpImpl.java
index 1d911e9..39aad9a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionLiteralPartImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionLiteralPartImpl.java
index a4a4e5b..7d0e5f2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionRangeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionRangeImpl.java
index e4dc294..8129a43 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionRangeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionRangeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionTypeImpl.java
index 473bbba..fa24057 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CollectionTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CommentImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CommentImpl.java
index 4225c78..41b843e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CommentImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CommentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteClassImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteClassImpl.java
index c7747ec..b912109 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteClassImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteClassImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteEnvironmentImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteEnvironmentImpl.java
index 216a45c..c873561 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteEnvironmentImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteEnvironmentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteModelImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteModelImpl.java
index 9519af4..3b4e5c1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteModelImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteModelImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompletePackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompletePackageImpl.java
index ad1a363..809751c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompletePackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompletePackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ConnectionPointReferenceImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ConnectionPointReferenceImpl.java
index 05e699e..3c8afec 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ConnectionPointReferenceImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ConnectionPointReferenceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ConstraintImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ConstraintImpl.java
index d4a490b..541c4e0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ConstraintImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ConstraintImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DataTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DataTypeImpl.java
index 217248d..fdb96df 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DataTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DataTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DetailImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DetailImpl.java
index 53c915d..699bfa3 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DetailImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DetailImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicBehaviorImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicBehaviorImpl.java
index e8c3ad5..6f1dc3a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicBehaviorImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicBehaviorImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicElementImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicElementImpl.java
index 81d7adc..953fc2b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicElementImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicPropertyImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicPropertyImpl.java
index 368e378..83dfd4a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicPropertyImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicPropertyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicTypeImpl.java
index 0d26263..ecda80f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicValueSpecificationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicValueSpecificationImpl.java
index c72347b..0269d8a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicValueSpecificationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/DynamicValueSpecificationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ElementExtensionImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ElementExtensionImpl.java
index 78c47dc..457d813 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ElementExtensionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ElementExtensionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ElementImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ElementImpl.java
index 5586dd2..b1339b6 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ElementImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumLiteralExpImpl.java
index 85f40ff..fc2351f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumerationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumerationImpl.java
index 8a44119..3f433b8 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumerationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumerationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumerationLiteralImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumerationLiteralImpl.java
index 4f811b4..5aa4d41 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumerationLiteralImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/EnumerationLiteralImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ExpressionInOCLImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ExpressionInOCLImpl.java
index 95a57f6..4132e85 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ExpressionInOCLImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ExpressionInOCLImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FeatureCallExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FeatureCallExpImpl.java
index 9ea6fce..dd34eb1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FeatureCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FeatureCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FeatureImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FeatureImpl.java
index 3cbe471..38d265f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FeatureImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FeatureImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FinalStateImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FinalStateImpl.java
index 5bf8516..37f5dce 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FinalStateImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/FinalStateImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IfExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IfExpImpl.java
index 1daa571..1128a88 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IfExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IfExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ImportImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ImportImpl.java
index 83b4aa2..e780ad9 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ImportImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ImportImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InstanceSpecificationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InstanceSpecificationImpl.java
index ea3f1b9..8e29e04 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InstanceSpecificationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InstanceSpecificationImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IntegerLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IntegerLiteralExpImpl.java
index bc373a4..9606016 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IntegerLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IntegerLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InvalidLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InvalidLiteralExpImpl.java
index 7e4e53c..c9039cf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InvalidLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InvalidLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InvalidTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InvalidTypeImpl.java
index 0f8c87c..e0c197e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InvalidTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/InvalidTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IterateExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IterateExpImpl.java
index ce4140e..ca13b9e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IterateExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IterateExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IterationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IterationImpl.java
index 208a832..3706a1c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IterationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IterationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IteratorExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IteratorExpImpl.java
index 481f0f9..7e4cfa2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IteratorExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IteratorExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IteratorVariableImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IteratorVariableImpl.java
index d73c457..04d2a46 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IteratorVariableImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/IteratorVariableImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LambdaTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LambdaTypeImpl.java
index 7d66b1e..09bfa4a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LambdaTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LambdaTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LanguageExpressionImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LanguageExpressionImpl.java
index 6d85c1b..3b09c7b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LanguageExpressionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LanguageExpressionImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LetExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LetExpImpl.java
index 007b794..be847fa 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LetExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LetExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LetVariableImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LetVariableImpl.java
index a084a1f..7d4e7b4 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LetVariableImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LetVariableImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LibraryImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LibraryImpl.java
index dd72521..d592ad3 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LibraryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LibraryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LiteralExpImpl.java
index b9512c6..c202e53 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LoopExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LoopExpImpl.java
index ae5e2f0..5ac04ce 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LoopExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/LoopExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapLiteralExpImpl.java
index 5605a81..b53ddc8 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapLiteralPartImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapLiteralPartImpl.java
index dfc99e0..1a990c9 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapTypeImpl.java
index 51d6b03..0a4d1c1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MapTypeImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MessageExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MessageExpImpl.java
index 1d34585..ca8cc2a 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MessageExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MessageExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MessageTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MessageTypeImpl.java
index 1f171d9..4f3cfc6 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MessageTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/MessageTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ModelImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ModelImpl.java
index 6b06d50..be9c465 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ModelImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ModelImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NamedElementImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NamedElementImpl.java
index 0ebafdf..b8ca8df 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NamedElementImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NamedElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NamespaceImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NamespaceImpl.java
index 18db99a..1b85ad36 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NamespaceImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NamespaceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NavigationCallExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NavigationCallExpImpl.java
index 2dfe127..46e8b05 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NavigationCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NavigationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NullLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NullLiteralExpImpl.java
index d3354d5..cdb2691 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NullLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NullLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NumericLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NumericLiteralExpImpl.java
index b8a0531..9706c98 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NumericLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/NumericLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OCLExpressionImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OCLExpressionImpl.java
index a6aa474..2e68912 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OCLExpressionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OCLExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OperationCallExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OperationCallExpImpl.java
index 3f644e7..6cba42b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OperationCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OperationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OperationImpl.java
index f925522..2915760 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OperationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OperationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OppositePropertyCallExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OppositePropertyCallExpImpl.java
index 81eaa8c..8c66496 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OppositePropertyCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OppositePropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OrderedSetTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OrderedSetTypeImpl.java
index ac26f6e..9c51c80 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OrderedSetTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OrderedSetTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OrphanCompletePackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OrphanCompletePackageImpl.java
index b420cea..eb29acf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OrphanCompletePackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/OrphanCompletePackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PackageImpl.java
index c31716d..c7869a3 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ParameterImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ParameterImpl.java
index 1cb961b..1b90b08 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ParameterImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ParameterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ParameterVariableImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ParameterVariableImpl.java
index 7647029..ac04986 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ParameterVariableImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ParameterVariableImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PivotFactoryImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PivotFactoryImpl.java
index 8720082..ccfdfc0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PivotFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PivotFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PivotPackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PivotPackageImpl.java
index 0b99534..dcadbfe 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PivotPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PivotPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrecedenceImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrecedenceImpl.java
index 30e47e2..00a4932 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrecedenceImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrecedenceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveCompletePackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveCompletePackageImpl.java
index 6c1ef65..a9a42b9 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveCompletePackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveCompletePackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveLiteralExpImpl.java
index b81a1bb..c13e07b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveTypeImpl.java
index b313a2c..7be72a0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PrimitiveTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ProfileApplicationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ProfileApplicationImpl.java
index 0d43d96..e3b8402 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ProfileApplicationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ProfileApplicationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ProfileImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ProfileImpl.java
index e8c8dff..59ad618 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ProfileImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ProfileImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PropertyCallExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PropertyCallExpImpl.java
index 4c78afe..03d24be 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PropertyCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PropertyImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PropertyImpl.java
index 0ba9c2f..979dbc1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PropertyImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PropertyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PseudostateImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PseudostateImpl.java
index 4286c6f..a3c00bd 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PseudostateImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/PseudostateImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/RealLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/RealLiteralExpImpl.java
index 5bacbff..3b94c64 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/RealLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/RealLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/RegionImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/RegionImpl.java
index 2d02d32..a340319 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/RegionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/RegionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ResultVariableImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ResultVariableImpl.java
index 3add472..f5c8ad6 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ResultVariableImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ResultVariableImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SelfTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SelfTypeImpl.java
index 6a85c85..fb313c7 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SelfTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SelfTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SendSignalActionImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SendSignalActionImpl.java
index 934d8ed..7d35479 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SendSignalActionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SendSignalActionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SequenceTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SequenceTypeImpl.java
index f083c7a..ea797a2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SequenceTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SequenceTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SetTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SetTypeImpl.java
index 2023deb..e837169 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SetTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SetTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ShadowExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ShadowExpImpl.java
index f90a549..f98d97d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ShadowExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ShadowExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ShadowPartImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ShadowPartImpl.java
index 25b39eb..964d19e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ShadowPartImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ShadowPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SignalImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SignalImpl.java
index 1e53269..ff1000b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SignalImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SignalImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SlotImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SlotImpl.java
index 17dd78c..cd027c9 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SlotImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/SlotImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StandardLibraryImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StandardLibraryImpl.java
index ae7f8fd..654b37b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StandardLibraryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StandardLibraryImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateExpImpl.java
index abc2dc7..0b0d5ac 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateImpl.java
index 53ef9fe..cfd9401 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateMachineImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateMachineImpl.java
index 96f4ebb..44ea19f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateMachineImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StateMachineImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StereotypeExtenderImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StereotypeExtenderImpl.java
index 4053daa..300b847 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StereotypeExtenderImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StereotypeExtenderImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StereotypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StereotypeImpl.java
index 7fc4757..e82641c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StereotypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StereotypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StringLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StringLiteralExpImpl.java
index c0dc478..e15719f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StringLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/StringLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateBindingImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateBindingImpl.java
index ea36de1..80cd94e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateBindingImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateBindingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateParameterImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateParameterImpl.java
index 8683774..1b69bd3 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateParameterImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateParameterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateParameterSubstitutionImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateParameterSubstitutionImpl.java
index c66f00c..e05dbec 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateParameterSubstitutionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateParameterSubstitutionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateSignatureImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateSignatureImpl.java
index cf7f9cd..d7eced0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateSignatureImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateSignatureImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateableElementImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateableElementImpl.java
index 8643559..830bb0d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateableElementImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TemplateableElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TransitionImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TransitionImpl.java
index 0a9dcd0..7d9c4c2 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TransitionImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TransitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TriggerImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TriggerImpl.java
index 3024e5c..b291e83 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TriggerImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TriggerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleLiteralExpImpl.java
index f6e81f4..2d9a802 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleLiteralPartImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleLiteralPartImpl.java
index ed56880..fe1bdb4 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TuplePartImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TuplePartImpl.java
index beac07c..ffb9dde 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TuplePartImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TuplePartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleTypeImpl.java
index 684a01f..ff37917 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TupleTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeExpImpl.java
index e9066db..40acffd 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeImpl.java
index 40d21a2..7563d07 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypedElementImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypedElementImpl.java
index 8a34f2b..451c08e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypedElementImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/TypedElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/UnlimitedNaturalLiteralExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/UnlimitedNaturalLiteralExpImpl.java
index 987f9ef..5631dde 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/UnlimitedNaturalLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/UnlimitedNaturalLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/UnspecifiedValueExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/UnspecifiedValueExpImpl.java
index f04ebb2..875988f 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/UnspecifiedValueExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/UnspecifiedValueExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ValueSpecificationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ValueSpecificationImpl.java
index 341f5a8..8e40ca4 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ValueSpecificationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/ValueSpecificationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableDeclarationImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableDeclarationImpl.java
index 6153765..ad911e5 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableDeclarationImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableDeclarationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableExpImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableExpImpl.java
index 7c95e64..5330764 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableExpImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableImpl.java
index 719c70a..c3667b6 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VertexImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VertexImpl.java
index 3ca2796..c3767ad 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VertexImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VertexImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VoidTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VoidTypeImpl.java
index 7d37015..e0b078b 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VoidTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/VoidTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/WildcardTypeImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/WildcardTypeImpl.java
index 06e8698..29ac894 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/WildcardTypeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/WildcardTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupEnvironment.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupEnvironment.java
index a211a51..64e3529 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupEnvironment.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupEnvironment.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupFactory.java
index 16b8e05..9d3db34 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupPackage.java
index b29a78a..d9ef406 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupPackage.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupTables.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupTables.java
index 0cc8c58..7fc4c71 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupTables.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/LookupTables.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupEnvironmentImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupEnvironmentImpl.java
index eb59fdb..97d4099 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupEnvironmentImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupEnvironmentImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupFactoryImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupFactoryImpl.java
index d9860c8..f9fd6dc 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupFactoryImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2018 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupPackageImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupPackageImpl.java
index 3855dc0..874d17c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/impl/LookupPackageImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/AbstractPivotLookupFilter.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/AbstractPivotLookupFilter.java
index 66da02b..f1d983d 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/AbstractPivotLookupFilter.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/AbstractPivotLookupFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/LookupAdapterFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/LookupAdapterFactory.java
index c107e53..07e54d3 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/LookupAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/LookupAdapterFactory.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/LookupSwitch.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/LookupSwitch.java
index 89ca9f2..ef843e8 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/LookupSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/LookupSwitch.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations Ltd., University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupFilter.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupFilter.java
index ef9fabd..e772424 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupFilter.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupResult.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupResult.java
index 161232e..fd2dbeb 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupResult.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupResult.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupResultImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupResultImpl.java
index a553242..0ad7a55 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupResultImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupResultImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupSolver.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupSolver.java
index 81fb4df..ad63553 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupSolver.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotLookupSolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotSingleResultLookupEnvironment.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotSingleResultLookupEnvironment.java
index e0c8e15..a5f18d1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotSingleResultLookupEnvironment.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/lookup/util/PivotSingleResultLookupEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLmetamodel.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLmetamodel.java
index cee73da..f1e6bcf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLmetamodel.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLmetamodel.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java
index 579ee49..58f187e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/model/OCLstdlib.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibFactory.java
index c92d0f1..3423020 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibPackage.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibPackage.java
index d31a8df..1dec3c4 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibTables.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibTables.java
index e59202c..59408de 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibTables.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/OCLstdlibTables.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/util/OCLstdlibAdapterFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/util/OCLstdlibAdapterFactory.java
index 9b07011..49f9f90 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/util/OCLstdlibAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/util/OCLstdlibAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/util/OCLstdlibSwitch.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/util/OCLstdlibSwitch.java
index cdb57fa..8fb3e9e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/util/OCLstdlibSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/util/OCLstdlibSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclAnyValidator.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclAnyValidator.java
index 30f2bf9..d041bb1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclAnyValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclAnyValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclInvalidValidator.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclInvalidValidator.java
index a92fc6e..b8b7961 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclInvalidValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclInvalidValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclVoidValidator.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclVoidValidator.java
index 5724dd0..41604f1 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclVoidValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/oclstdlib/validation/OclVoidValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractDelegatingVisitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractDelegatingVisitor.java
index ded40db..1240164 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractDelegatingVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractDelegatingVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractExtendingPivotVisitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractExtendingPivotVisitor.java
index 9f832b8..695ff13 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractExtendingPivotVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractExtendingPivotVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractExtendingVisitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractExtendingVisitor.java
index 0187bff..283e693 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractExtendingVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractExtendingVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractMergedVisitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractMergedVisitor.java
index 93118c8..b4b4a2c 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractMergedVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractMergedVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractNullVisitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractNullVisitor.java
index ba13461..ec40150 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractNullVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractNullVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractPivotCommonLookupVisitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractPivotCommonLookupVisitor.java
index d5c3210..529cef0 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractPivotCommonLookupVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractPivotCommonLookupVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractVisitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractVisitor.java
index cc15c8d..258545e 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractWrappingVisitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractWrappingVisitor.java
index 58b0551..7ac76cd 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractWrappingVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/AbstractWrappingVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/DerivedConstants.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/DerivedConstants.java
index 6b04900..19f50b3 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/DerivedConstants.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/DerivedConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotAdapterFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotAdapterFactory.java
index 837cca1..869d0bd 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotPlugin.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotPlugin.java
index 8305585..4a8ffbf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotPlugin.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotPlugin.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotSwitch.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotSwitch.java
index cb747bc..2b39dc4 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotValidator.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotValidator.java
index 212febb..a7928be 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/PivotValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/Visitable.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/Visitable.java
index 7dc7898..cd3a0a8 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/Visitable.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/Visitable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/Visitor.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/Visitor.java
index 231a063..d0d1fcf 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/Visitor.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/util/Visitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/values/util/ValuesAdapterFactory.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/values/util/ValuesAdapterFactory.java
index f38bda5..b7a7335 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/values/util/ValuesAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/values/util/ValuesAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/values/util/ValuesSwitch.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/values/util/ValuesSwitch.java
index 1f11aca..db75915 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/values/util/ValuesSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/values/util/ValuesSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/model/Lookup.genmodel b/plugins/org.eclipse.ocl.pivot/model/Lookup.genmodel
index 1daa6d1..ab87b62 100644
--- a/plugins/org.eclipse.ocl.pivot/model/Lookup.genmodel
+++ b/plugins/org.eclipse.ocl.pivot/model/Lookup.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) 2014, 2017 Willink Transformations Ltd., University of York and others.&#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;    Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014, 2017 Willink Transformations Ltd., University of York and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at &#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    Adolfo Sanchez-Barbudo Herrera (University of York) - initial API and implementation"
     modelDirectory="/org.eclipse.ocl.pivot/emf-gen" modelPluginID="org.eclipse.ocl.pivot"
     modelName="PivotLookup" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     suppressEMFModelTags="true" importerID="org.eclipse.emf.importer.ecore" bundleManifest="false"
diff --git a/plugins/org.eclipse.ocl.pivot/model/Pivot.genmodel b/plugins/org.eclipse.ocl.pivot/model/Pivot.genmodel
index d1b87e3..4bc1bd3 100644
--- a/plugins/org.eclipse.ocl.pivot/model/Pivot.genmodel
+++ b/plugins/org.eclipse.ocl.pivot/model/Pivot.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.pivot/emf-gen" creationIcons="false" creationSubmenus="true"
     editDirectory="/org.eclipse.ocl.pivot.edit/src" editorDirectory="/org.eclipse.ocl.pivot.editor/src"
     modelPluginID="org.eclipse.ocl.pivot" templateDirectory="" forceOverwrite="true"
diff --git a/plugins/org.eclipse.ocl.pivot/model/PivotAnnotations.genmodel b/plugins/org.eclipse.ocl.pivot/model/PivotAnnotations.genmodel
index 4a78586..7637fe1 100644
--- a/plugins/org.eclipse.ocl.pivot/model/PivotAnnotations.genmodel
+++ b/plugins/org.eclipse.ocl.pivot/model/PivotAnnotations.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.pivot/emf-gen" modelPluginID="org.eclipse.ocl.pivot"
     modelName="PivotAnnotations" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     suppressEMFTypes="true" importerID="org.eclipse.emf.importer.ecore" bundleManifest="false"
diff --git a/plugins/org.eclipse.ocl.pivot/model/oclstdlib.genmodel b/plugins/org.eclipse.ocl.pivot/model/oclstdlib.genmodel
index 5ae41ac..23c9e0f 100644
--- a/plugins/org.eclipse.ocl.pivot/model/oclstdlib.genmodel
+++ b/plugins/org.eclipse.ocl.pivot/model/oclstdlib.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.pivot/emf-gen" editDirectory="/org.eclipse.ocl.pivot.edit/emf-gen"
     editorDirectory="/org.eclipse.ocl.pivot.editor/emf-gen" modelPluginID="org.eclipse.ocl.pivot"
     modelName="OCLstdlib" nonNLSMarkers="true" suppressEMFModelTags="true" suppressInterfaces="true"
diff --git a/plugins/org.eclipse.ocl.pivot/plugin.properties b/plugins/org.eclipse.ocl.pivot/plugin.properties
index d6910fc..a115d35 100644
--- a/plugins/org.eclipse.ocl.pivot/plugin.properties
+++ b/plugins/org.eclipse.ocl.pivot/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/schema/as_resource_factory.exsd b/plugins/org.eclipse.ocl.pivot/schema/as_resource_factory.exsd
index 1cd0d4a..49fdd3f 100644
--- a/plugins/org.eclipse.ocl.pivot/schema/as_resource_factory.exsd
+++ b/plugins/org.eclipse.ocl.pivot/schema/as_resource_factory.exsd
@@ -128,8 +128,8 @@
       <documentation>
          Copyright (c) 2013 Willink Transformations and others.
 
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at &lt;a 
+href=&quot;http://www.eclipse.org/legal/epl-v20.html&quot;&gt;http://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.ocl.pivot/schema/complete_ocl_registry.exsd b/plugins/org.eclipse.ocl.pivot/schema/complete_ocl_registry.exsd
index f38dc46..509c03a 100644
--- a/plugins/org.eclipse.ocl.pivot/schema/complete_ocl_registry.exsd
+++ b/plugins/org.eclipse.ocl.pivot/schema/complete_ocl_registry.exsd
@@ -118,8 +118,8 @@
       <documentation>
          Copyright (c) 2013 Obeo and others.
 
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at &lt;a 
+href=&quot;http://www.eclipse.org/legal/epl-v20.html&quot;&gt;http://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.ocl.pivot/schema/label_generator.exsd b/plugins/org.eclipse.ocl.pivot/schema/label_generator.exsd
index 5937c03..9e20fdf 100644
--- a/plugins/org.eclipse.ocl.pivot/schema/label_generator.exsd
+++ b/plugins/org.eclipse.ocl.pivot/schema/label_generator.exsd
@@ -135,8 +135,8 @@
       </appinfo>
       <documentation>
          Copyright (c) 2010 Willink Transformations and others.&lt;br&gt;
-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 &lt;a 
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at &lt;a 
+href=&quot;http://www.eclipse.org/legal/epl-v20.html&quot;&gt;http://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/CompleteInheritance.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/CompleteInheritance.java
index 9aea240..425a1e9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/CompleteInheritance.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/CompleteInheritance.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/InheritanceFragment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/InheritanceFragment.java
index 6fc3e7a..a04295d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/InheritanceFragment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/InheritanceFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ParameterTypes.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ParameterTypes.java
index 79951b2..7ca484e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ParameterTypes.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ParameterTypes.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/TemplateParameters.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/TemplateParameters.java
index ccbd310..d9d8c97 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/TemplateParameters.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/TemplateParameters.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractConstraintEvaluator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractConstraintEvaluator.java
index c05ad90..95f40d9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractConstraintEvaluator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractConstraintEvaluator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractLogger.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractLogger.java
index a5cdf10..408085e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractLogger.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractLogger.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractModelManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractModelManager.java
index c18bf8b..407e7e0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractModelManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/AbstractModelManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationEnvironment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationEnvironment.java
index e7db804..3e92119 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationEnvironment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationException.java
index f5c583e..3140a38 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink (CEA LIST) - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationHaltedException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationHaltedException.java
index d225734..188d414 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationHaltedException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationHaltedException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Borland Software Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Radek Dvorak - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationLogger.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationLogger.java
index 1b713a5..2b0f840 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationLogger.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationLogger.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationVisitor.java
index 145560a..8f19976 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/EvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/Evaluator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/Evaluator.java
index 65f295b..a963a9b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/Evaluator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/Evaluator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/Executor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/Executor.java
index 04b66c4..a89769d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/Executor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/Executor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IndentingLogger.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IndentingLogger.java
index 19e7a6a..14d6b67 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IndentingLogger.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IndentingLogger.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IterationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IterationManager.java
index d5fd6c6..31f41f9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IterationManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/IterationManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/ModelManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/ModelManager.java
index 86a9bff..7c12e97 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/ModelManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/evaluation/ModelManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/BindingsId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/BindingsId.java
index 46e37b8..0ea26d2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/BindingsId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/BindingsId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/BuiltInTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/BuiltInTypeId.java
index 2b450ae..6a64dbd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/BuiltInTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/BuiltInTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ClassId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ClassId.java
index 999806b..c19af67 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ClassId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ClassId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/CollectionTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/CollectionTypeId.java
index cb7da8f..ec8e9d0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/CollectionTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/CollectionTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/DataTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/DataTypeId.java
index 74d5332..4f1fa6b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/DataTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/DataTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ElementId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ElementId.java
index 8514e93..0e365bf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ElementId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ElementId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/EnumerationId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/EnumerationId.java
index 62a74b6..16677f1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/EnumerationId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/EnumerationId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/EnumerationLiteralId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/EnumerationLiteralId.java
index fb72971..498838e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/EnumerationLiteralId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/EnumerationLiteralId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdHash.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdHash.java
index 469ee8f..25b8804 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdHash.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdHash.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdManager.java
index ffc9ad3..923faf2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdResolver.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdResolver.java
index 00e3764..efd9899 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdResolver.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdResolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdVisitor.java
index 8aa873f..ae1bf9a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/IdVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/LambdaTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/LambdaTypeId.java
index b9f2731..68750dd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/LambdaTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/LambdaTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/MapTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/MapTypeId.java
index 2810ef2..13edcb0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/MapTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/MapTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NestedPackageId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NestedPackageId.java
index ea19e2b..ee025ae 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NestedPackageId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NestedPackageId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NestedTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NestedTypeId.java
index 8a66b8a..ab3b507 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NestedTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NestedTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NsURIPackageId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NsURIPackageId.java
index 433d66b..36b9a07 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NsURIPackageId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/NsURIPackageId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OclInvalidTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OclInvalidTypeId.java
index 36b3f14..6e7f696 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OclInvalidTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OclInvalidTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OclVoidTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OclVoidTypeId.java
index bdcceea..ab92d0b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OclVoidTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OclVoidTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OperationId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OperationId.java
index 842ca2a..694e6ae 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OperationId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/OperationId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PackageId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PackageId.java
index 6866c73..1dd1572 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PackageId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PackageId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ParametersId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ParametersId.java
index 25b5138..09fef86 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ParametersId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/ParametersId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PrimitiveTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PrimitiveTypeId.java
index 14bac2e..959a857 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PrimitiveTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PrimitiveTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PropertyId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PropertyId.java
index 55681a4..4c16491 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PropertyId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/PropertyId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/RootPackageId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/RootPackageId.java
index ade827d..4a791d4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/RootPackageId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/RootPackageId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/SpecializedId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/SpecializedId.java
index 3c77d6c..bef4c19 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/SpecializedId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/SpecializedId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateBinding.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateBinding.java
index c75798d..1b2c14d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateBinding.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateBinding.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateParameterId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateParameterId.java
index 8e7951c..5de77ec 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateParameterId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateParameterId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateableId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateableId.java
index ce1b191..e41b308 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateableId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateableId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateableTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateableTypeId.java
index fb9478e..8804f5c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateableTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TemplateableTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TuplePartId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TuplePartId.java
index 2bb2696..a5a7ed4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TuplePartId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TuplePartId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TupleTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TupleTypeId.java
index 68a5fe9..cb35827 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TupleTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TupleTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TypeId.java
index 3b9119a..c743025 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/TypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/UnspecifiedId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/UnspecifiedId.java
index 6162a30..b4f1e63 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/UnspecifiedId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/ids/UnspecifiedId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ClassAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ClassAttribution.java
index 205f311..4d333e9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ClassAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ClassAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/DataTypeAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/DataTypeAttribution.java
index b978aac..3f2ff39 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/DataTypeAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/DataTypeAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/EnumerationAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/EnumerationAttribution.java
index 9f626f7..d6a2083 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/EnumerationAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/EnumerationAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ExpressionInOCLAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ExpressionInOCLAttribution.java
index 34ab982..fd30d96 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ExpressionInOCLAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ExpressionInOCLAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/IterateExpAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/IterateExpAttribution.java
index 41a3d0b..36b6aff 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/IterateExpAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/IterateExpAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/IteratorExpAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/IteratorExpAttribution.java
index 8ae5190..a419aee 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/IteratorExpAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/IteratorExpAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/LetExpAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/LetExpAttribution.java
index ce1b9df..42de4e3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/LetExpAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/LetExpAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/LibraryAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/LibraryAttribution.java
index 0b93cb0..bf4b5d1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/LibraryAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/LibraryAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ModelAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ModelAttribution.java
index ba4d9d0..cc3465b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ModelAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/ModelAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/OperationAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/OperationAttribution.java
index 3ef749f..440a708 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/OperationAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/OperationAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/OperationCallExpAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/OperationCallExpAttribution.java
index 3e2f3b4..09ee175 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/OperationCallExpAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/OperationCallExpAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/PackageAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/PackageAttribution.java
index 31148e6..e7bb32a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/PackageAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/PackageAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/PropertyAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/PropertyAttribution.java
index f1c8c8e..f880e57 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/PropertyAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/PropertyAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/TemplateParameterAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/TemplateParameterAttribution.java
index b39b234..602dd78 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/TemplateParameterAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/TemplateParameterAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/VariableAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/VariableAttribution.java
index 12e38b3..8c796bc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/VariableAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/VariableAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/VoidTypeAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/VoidTypeAttribution.java
index 7c548aa..8708cb7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/VoidTypeAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/attributes/VoidTypeAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/compatibility/EMF_2_9.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/compatibility/EMF_2_9.java
index a3f0a55..75cb291 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/compatibility/EMF_2_9.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/compatibility/EMF_2_9.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/AbstractCompletePackages.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/AbstractCompletePackages.java
index 9035f19..2951e11 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/AbstractCompletePackages.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/AbstractCompletePackages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/AbstractListeners.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/AbstractListeners.java
index 5fa2fbc..3ac2572 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/AbstractListeners.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/AbstractListeners.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/ClassListeners.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/ClassListeners.java
index a4bda46..5c9cf0e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/ClassListeners.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/ClassListeners.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteClassInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteClassInternal.java
index f8e9bb4..ff5ed76 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteClassInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteClassInternal.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteClasses.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteClasses.java
index 0615ea6..4646445 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteClasses.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteClasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteEnvironmentInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteEnvironmentInternal.java
index f1703d7..b875404 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteEnvironmentInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteEnvironmentInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteInheritanceImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteInheritanceImpl.java
index a0547bb..03f2870 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteInheritanceImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteInheritanceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteModelInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteModelInternal.java
index ad9aefd..02fe2ff 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteModelInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteModelInternal.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompletePackageInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompletePackageInternal.java
index 32ecb7c..1db4ffa 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompletePackageInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompletePackageInternal.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteURIs.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteURIs.java
index 0c71458..ccdec84 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteURIs.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteURIs.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/ModelListeners.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/ModelListeners.java
index a98c94d..a691073 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/ModelListeners.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/ModelListeners.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/NestedCompletePackages.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/NestedCompletePackages.java
index d684e43..fc9850f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/NestedCompletePackages.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/NestedCompletePackages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PackageListeners.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PackageListeners.java
index e1eaf1e..a7262cc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PackageListeners.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PackageListeners.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialClasses.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialClasses.java
index 36b2e17..6cbdc59 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialClasses.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialClasses.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialModels.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialModels.java
index 6b06c93..40b7999 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialModels.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialModels.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialOperations.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialOperations.java
index a766294..802c5e5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialOperations.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialPackages.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialPackages.java
index e102e6e..8641da5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialPackages.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialPackages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialProperties.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialProperties.java
index 6a3a692..c7ea83d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialProperties.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/PartialProperties.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/RootCompletePackages.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/RootCompletePackages.java
index e0772b2..e178cd0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/RootCompletePackages.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/RootCompletePackages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/StandardLibraryInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/StandardLibraryInternal.java
index a9d517b..3c6a924 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/StandardLibraryInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/StandardLibraryInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/AbstractBase2ASConversion.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/AbstractBase2ASConversion.java
index 36b2e15..e9d633a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/AbstractBase2ASConversion.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/AbstractBase2ASConversion.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/AbstractParserContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/AbstractParserContext.java
index 59a2943..3e4f6b2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/AbstractParserContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/AbstractParserContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/Base2ASConversion.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/Base2ASConversion.java
index 5336de1..5c89142 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/Base2ASConversion.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/Base2ASConversion.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/ClassContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/ClassContext.java
index 93b90f1..cf25298 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/ClassContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/ClassContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/DiagnosticContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/DiagnosticContext.java
index 1afb7d5..2660e49 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/DiagnosticContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/DiagnosticContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EClassContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EClassContext.java
index 96fc742..c7250c6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EClassContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EClassContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EInvocationContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EInvocationContext.java
index da8833a..d9918a4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EInvocationContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EInvocationContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EObjectContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EObjectContext.java
index b2f6aad..27ab348 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EObjectContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/EObjectContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/ModelContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/ModelContext.java
index 81d2a83..d9c299f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/ModelContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/ModelContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/OperationContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/OperationContext.java
index e8f4056..f3aa898 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/OperationContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/OperationContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/PropertyContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/PropertyContext.java
index f148281..adcbe29 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/PropertyContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/context/PropertyContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/AbstractDelegatedBehavior.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/AbstractDelegatedBehavior.java
index 4308314..29bd99d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/AbstractDelegatedBehavior.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/AbstractDelegatedBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/AbstractOCLDelegateFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/AbstractOCLDelegateFactory.java
index fe28419..9b1fe97 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/AbstractOCLDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/AbstractOCLDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateDomain.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateDomain.java
index b8df76f..86374d2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateDomain.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateDomain.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateEClassifierAdapter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateEClassifierAdapter.java
index 5f55b53..d96c10b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateEClassifierAdapter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateEClassifierAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateEPackageAdapter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateEPackageAdapter.java
index 1e79d82..80432a0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateEPackageAdapter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateEPackageAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateInstaller.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateInstaller.java
index 900420f..12d4278 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateInstaller.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateInstaller.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateResourceAdapter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateResourceAdapter.java
index a5d0f6c..ccc1496 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateResourceAdapter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegateResourceAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegatedBehavior.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegatedBehavior.java
index 82e31c6..d6787c9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegatedBehavior.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/DelegatedBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/InvocationBehavior.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/InvocationBehavior.java
index 0764783..0b5ae29 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/InvocationBehavior.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/InvocationBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateDomain.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateDomain.java
index f61b01a..8ed2da5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateDomain.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateDomain.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateDomainFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateDomainFactory.java
index 1bb9dfa..631e196 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateDomainFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateDomainFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateException.java
index f391d64..003debd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateValidator.java
index 687ee59..65d8c10 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLDelegateValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink (CEA LIST) - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLInvocationDelegate.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLInvocationDelegate.java
index bc8cb8e..4bf5db1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLInvocationDelegate.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLInvocationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLInvocationDelegateFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLInvocationDelegateFactory.java
index 529a998..58ec573 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLInvocationDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLInvocationDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLQueryDelegate.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLQueryDelegate.java
index 007c8f8..7f2028f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLQueryDelegate.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLQueryDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Kenn Hussey 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Kenn Hussey - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLQueryDelegateFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLQueryDelegateFactory.java
index d63db98..0cdf690 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLQueryDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLQueryDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Kenn Hussey 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Kenn Hussey - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLSettingDelegate.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLSettingDelegate.java
index 7f18756..4c038dd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLSettingDelegate.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLSettingDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLSettingDelegateFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLSettingDelegateFactory.java
index 9585b3a..46b649f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLSettingDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLSettingDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLValidationDelegate.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLValidationDelegate.java
index bdce51a..f4b5df7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLValidationDelegate.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLValidationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLValidationDelegateFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLValidationDelegateFactory.java
index 8515630..263d950 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLValidationDelegateFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/OCLValidationDelegateFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/SettingBehavior.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/SettingBehavior.java
index 4ef6850..e8029b7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/SettingBehavior.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/SettingBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationBehavior.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationBehavior.java
index 02ab77b..c5f950e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationBehavior.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationBehavior.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationDelegate.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationDelegate.java
index dc6c692..244e8c6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationDelegate.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationDelegate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationDelegateExtension.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationDelegateExtension.java
index b4b8ac8..ab862a8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationDelegateExtension.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValidationDelegateExtension.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValueConverter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValueConverter.java
index baeba58..7eccda2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValueConverter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/delegate/ValueConverter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EObjectOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EObjectOperation.java
index fcaf716..cd1a5a2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EObjectOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EObjectOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EObjectProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EObjectProperty.java
index 47ae469..09b2315 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EObjectProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EObjectProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/Ecore2Moniker.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/Ecore2Moniker.java
index f7b5620..1db0d7c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/Ecore2Moniker.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/Ecore2Moniker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EcoreASResourceFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EcoreASResourceFactory.java
index ce91ca2..c73bf3b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EcoreASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EcoreASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EcoreASResourceImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EcoreASResourceImpl.java
index dacbc9b..f575368 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EcoreASResourceImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/EcoreASResourceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2Ecore.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2Ecore.java
index d865b78..3074f0a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2Ecore.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2Ecore.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreDeclarationVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreDeclarationVisitor.java
index eebc3a3..aa18214 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreDeclarationVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreDeclarationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreReferenceVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreReferenceVisitor.java
index 9b325cd..27d8f56 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreReferenceVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreReferenceVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreTypeRefVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreTypeRefVisitor.java
index 77ff8f1..85cda24 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreTypeRefVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/as2es/AS2EcoreTypeRefVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/AbstractExternal2AS.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/AbstractExternal2AS.java
index 8dd0e04..b49e330 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/AbstractExternal2AS.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/AbstractExternal2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2AS.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2AS.java
index 9c9c3d4..a949f0c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2AS.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2ASDeclarationSwitch.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2ASDeclarationSwitch.java
index 91bd950..4015a9f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2ASDeclarationSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2ASDeclarationSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2ASReferenceSwitch.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2ASReferenceSwitch.java
index 52e2d5d..379288d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2ASReferenceSwitch.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ecore/es2as/Ecore2ASReferenceSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorClass.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorClass.java
index b9be957..1f42cbc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorClass.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorClass.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorElement.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorElement.java
index 4f95193..05cf3c7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorElement.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorEnumerationLiteral.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorEnumerationLiteral.java
index e02ef4e..24ea04c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorEnumerationLiteral.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorEnumerationLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorFeature.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorFeature.java
index c672212..d44f04f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorFeature.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorFeature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorNamedElement.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorNamedElement.java
index 87aac16..9b3feae 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorNamedElement.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorNamedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorOperation.java
index 484fab1..d455ad7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorPackage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorPackage.java
index 47d6e7c..c22f7ad 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorParameter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorParameter.java
index a25e459..8c1c7ae 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorParameter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorParameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorProperty.java
index bb3371e..1050efd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorType.java
index 64ffe40..b352520 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorTypedElement.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorTypedElement.java
index 4ab988f..2f5d7b3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorTypedElement.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/elements/AbstractExecutorTypedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractCustomizable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractCustomizable.java
index c5a9c67..d9978b7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractCustomizable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractCustomizable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractEvaluationVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractEvaluationVisitor.java
index c60c3d8..9a414bf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractEvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractEvaluationVisitorDecorator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractEvaluationVisitorDecorator.java
index a2c9f45..0666529 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractEvaluationVisitorDecorator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractEvaluationVisitorDecorator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractExecutor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractExecutor.java
index a55252b..1a9ce84 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractExecutor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/AbstractExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicEvaluationEnvironment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicEvaluationEnvironment.java
index 72ca439..c4a813b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicEvaluationEnvironment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicEvaluationVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicEvaluationVisitor.java
index c2899aa..ff21d68 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicEvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicOCLExecutor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicOCLExecutor.java
index 16a4166..29a5074 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicOCLExecutor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/BasicOCLExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/EvaluationCache.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/EvaluationCache.java
index f6bda9d..90e4e6b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/EvaluationCache.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/EvaluationCache.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/EvaluationVisitorDecorator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/EvaluationVisitorDecorator.java
index cd1eeec..99951b6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/EvaluationVisitorDecorator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/EvaluationVisitorDecorator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/ExecutorInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/ExecutorInternal.java
index 9a5f00a..3cef038 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/ExecutorInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/ExecutorInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/OCLEvaluationVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/OCLEvaluationVisitor.java
index 53143d6..7e6482d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/OCLEvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/OCLEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/OCLExecutor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/OCLExecutor.java
index ddf206f..0069b80 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/OCLExecutor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/OCLExecutor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/PivotModelManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/PivotModelManager.java
index fd8713f..beedb9e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/PivotModelManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/PivotModelManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/ShadowCache.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/ShadowCache.java
index 0665387..b0cbead 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/ShadowCache.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/ShadowCache.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/TracingEvaluationVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/TracingEvaluationVisitor.java
index da6fccf..3e8939d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/TracingEvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/evaluation/TracingEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/AbstractSpecializedType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/AbstractSpecializedType.java
index 5eb2a57..1d709c1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/AbstractSpecializedType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/AbstractSpecializedType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorCollectionType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorCollectionType.java
index 3ff5c68..80cf796 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorCollectionType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorCollectionType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorMapType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorMapType.java
index 982a0a6..7ed59b9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorMapType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorMapType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorTuplePart.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorTuplePart.java
index 5eb64bf..de1929b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorTuplePart.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorTuplePart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorTupleType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorTupleType.java
index 9d78440..ac577b0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorTupleType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/ExecutorTupleType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/PivotExecutorStandardLibrary.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/PivotExecutorStandardLibrary.java
index 2b53f0b..b973d77 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/PivotExecutorStandardLibrary.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/PivotExecutorStandardLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/PivotReflectiveFragment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/PivotReflectiveFragment.java
index 3f3d396..8f15b21 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/PivotReflectiveFragment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/executor/PivotReflectiveFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/HelperUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/HelperUtil.java
index f93ee73..e502a01 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/HelperUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/HelperUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/OCLHelperImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/OCLHelperImpl.java
index e86e9e2..7b8bfbc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/OCLHelperImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/OCLHelperImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/QueryImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/QueryImpl.java
index 8656bd2..2ef3eb5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/QueryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/helper/QueryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractElementId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractElementId.java
index 7299e6a..c85a47c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractElementId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractElementId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractGeneralizedIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractGeneralizedIdImpl.java
index 0acab4b..3a81967 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractGeneralizedIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractGeneralizedIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractPackageIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractPackageIdImpl.java
index 0a383a7..6c429b6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractPackageIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractPackageIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractSpecializedIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractSpecializedIdImpl.java
index 7c1c235..42a436c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractSpecializedIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractSpecializedIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractTemplateableIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractTemplateableIdImpl.java
index a67ed8e..8fd1b19 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractTemplateableIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractTemplateableIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractTypeId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractTypeId.java
index 35d81df..36c961b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractTypeId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/AbstractTypeId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/BindingsIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/BindingsIdImpl.java
index ec4c4cd..cdc4d5f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/BindingsIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/BindingsIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/EnumerationIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/EnumerationIdImpl.java
index f3cdbdd..4fb7e9b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/EnumerationIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/EnumerationIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/EnumerationLiteralIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/EnumerationLiteralIdImpl.java
index 3e832f4..594440e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/EnumerationLiteralIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/EnumerationLiteralIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedClassIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedClassIdImpl.java
index 60eadea..f6790dc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedClassIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedClassIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedCollectionTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedCollectionTypeIdImpl.java
index a88d97e..b2871cc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedCollectionTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedCollectionTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedDataTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedDataTypeIdImpl.java
index 49455bb..91278b6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedDataTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedDataTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedLambdaTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedLambdaTypeIdImpl.java
index 35f147e..1713f61 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedLambdaTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedLambdaTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedMapTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedMapTypeIdImpl.java
index 8703714..5544053 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedMapTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedMapTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedNestedTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedNestedTypeIdImpl.java
index 8694352..e6cbea4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedNestedTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedNestedTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedOperationIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedOperationIdImpl.java
index 82605b9..ba1c30e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedOperationIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedOperationIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedTupleTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedTupleTypeIdImpl.java
index 58bc465..f862078 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedTupleTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedTupleTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedTypeIdImpl.java
index 85e2c7f..803e502 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/GeneralizedTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/NestedPackageIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/NestedPackageIdImpl.java
index f3c0520..d3faaed 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/NestedPackageIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/NestedPackageIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/NsURIPackageIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/NsURIPackageIdImpl.java
index 853bea0..9e24cf7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/NsURIPackageIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/NsURIPackageIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/OclInvalidTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/OclInvalidTypeIdImpl.java
index 6c12359..d55aa18 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/OclInvalidTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/OclInvalidTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/OclVoidTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/OclVoidTypeIdImpl.java
index b8250e6..bc62b61 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/OclVoidTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/OclVoidTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/ParametersIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/ParametersIdImpl.java
index f8d2ca6..7f413fc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/ParametersIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/ParametersIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/PrimitiveTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/PrimitiveTypeIdImpl.java
index 4f85cea..4a05b77 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/PrimitiveTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/PrimitiveTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/PropertyIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/PropertyIdImpl.java
index 4531f2c..3458772 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/PropertyIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/PropertyIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/RootPackageIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/RootPackageIdImpl.java
index 2f9b936..32c1cf5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/RootPackageIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/RootPackageIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedCollectionTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedCollectionTypeIdImpl.java
index 0510b17..77b015c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedCollectionTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedCollectionTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedLambdaTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedLambdaTypeIdImpl.java
index 4d7d74e..6f28195 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedLambdaTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedLambdaTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedMapTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedMapTypeIdImpl.java
index b8ac97f..ce224d4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedMapTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedMapTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedOperationIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedOperationIdImpl.java
index 49c62fc..4acda37 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedOperationIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedOperationIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedTypeIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedTypeIdImpl.java
index 84fc651..366b12e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedTypeIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/SpecializedTypeIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TemplateBindingImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TemplateBindingImpl.java
index 2eab78b..518f49e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TemplateBindingImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TemplateBindingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TemplateParameterIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TemplateParameterIdImpl.java
index 51d03b6..15ab281 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TemplateParameterIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TemplateParameterIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TuplePartIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TuplePartIdImpl.java
index 53a0708..3cb3a20 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TuplePartIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/TuplePartIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/UnscopedId.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/UnscopedId.java
index 42adcba..2dd8999 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/UnscopedId.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/UnscopedId.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/UnspecifiedIdImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/UnspecifiedIdImpl.java
index d4e2a36..ffe365f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/UnspecifiedIdImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/UnspecifiedIdImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference2.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference2.java
index 9db6823..67564b8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference2.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference3.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference3.java
index 1c2c4cc..e3822ef 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference3.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference3.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference4.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference4.java
index cfbb105..4b2e27e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference4.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfListOfWeakReference4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfWeakReference.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfWeakReference.java
index c75297b..3c2f813 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfWeakReference.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/ids/WeakHashMapOfWeakReference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/BooleanLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/BooleanLabelGenerator.java
index 07e9202..288742b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/BooleanLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/BooleanLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ClassLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ClassLabelGenerator.java
index 024b664..e32ede5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ClassLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ClassLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/DynamicEObjectImplLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/DynamicEObjectImplLabelGenerator.java
index cc24dae..178f815 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/DynamicEObjectImplLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/DynamicEObjectImplLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EAnnotationLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EAnnotationLabelGenerator.java
index 84ae63f..7d5f038 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EAnnotationLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EAnnotationLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EGenericTypeLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EGenericTypeLabelGenerator.java
index 7151cf2..4dc9759 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EGenericTypeLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EGenericTypeLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ENamedElementLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ENamedElementLabelGenerator.java
index 479da33..75a482e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ENamedElementLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ENamedElementLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EObjectLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EObjectLabelGenerator.java
index 75f44d0..d2ce803 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EObjectLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EObjectLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EcoreURILabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EcoreURILabelGenerator.java
index 73ea299..1483133 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EcoreURILabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/EcoreURILabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ElementIdLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ElementIdLabelGenerator.java
index ed607a0..aae44d8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ElementIdLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ElementIdLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ExpressionInOCLLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ExpressionInOCLLabelGenerator.java
index d57fb75..847617c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ExpressionInOCLLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ExpressionInOCLLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/FileLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/FileLabelGenerator.java
index 0036374..57e34ac 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/FileLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/FileLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/LabelSubstitutionLabelProvider.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/LabelSubstitutionLabelProvider.java
index 4839646..f9ca98a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/LabelSubstitutionLabelProvider.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/LabelSubstitutionLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ModelLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ModelLabelGenerator.java
index ccb899e..3ef5a2e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ModelLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ModelLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/NameableLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/NameableLabelGenerator.java
index 05adf59..0ecab5c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/NameableLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/NameableLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/NumberLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/NumberLabelGenerator.java
index f78298e..b96eb61 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/NumberLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/NumberLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ResourceLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ResourceLabelGenerator.java
index a0f3424..dde2304 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ResourceLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ResourceLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/StringLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/StringLabelGenerator.java
index 7bd773d..f95b163 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/StringLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/StringLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ValueLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ValueLabelGenerator.java
index 61e3596..8361b7e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ValueLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/labels/ValueLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/BaseProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/BaseProperty.java
index 60838c3..71cfc87 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/BaseProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/BaseProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/CompositionProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/CompositionProperty.java
index 71c6fe2..d233099 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/CompositionProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/CompositionProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ConstrainedOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ConstrainedOperation.java
index 7f89f39..65eedd0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ConstrainedOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ConstrainedOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ConstrainedProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ConstrainedProperty.java
index c5200b3..978968c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ConstrainedProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ConstrainedProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/EInvokeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/EInvokeOperation.java
index 84932bb..a23b954 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/EInvokeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/EInvokeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ExplicitNavigationProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ExplicitNavigationProperty.java
index e227f6a..a4d58d3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ExplicitNavigationProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ExplicitNavigationProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ExtensionProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ExtensionProperty.java
index 97000d8..d741047 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ExtensionProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ExtensionProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ImplementationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ImplementationManager.java
index dcfdd84..5c17d16 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ImplementationManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ImplementationManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ImplicitNonCompositionProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ImplicitNonCompositionProperty.java
index 74d5383..5053770 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ImplicitNonCompositionProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ImplicitNonCompositionProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/JavaCompareToOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/JavaCompareToOperation.java
index 844d5ac..2fb6ab4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/JavaCompareToOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/JavaCompareToOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/RegisteredContribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/RegisteredContribution.java
index 06dabf0..c2fb86c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/RegisteredContribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/RegisteredContribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StandardLibraryContribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StandardLibraryContribution.java
index 383491e..8915985 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StandardLibraryContribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StandardLibraryContribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StaticProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StaticProperty.java
index 63cb766..06b0028 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StaticProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StaticProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StereotypeProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StereotypeProperty.java
index 192f301..9bddd63 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StereotypeProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/StereotypeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/TuplePartProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/TuplePartProperty.java
index 60cc2c5..1354c4d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/TuplePartProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/TuplePartProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedCompositionProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedCompositionProperty.java
index d033586..b07fe05 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedCompositionProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedCompositionProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedExplicitNavigationProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedExplicitNavigationProperty.java
index 452ff46..98da965 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedExplicitNavigationProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedExplicitNavigationProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedOppositeNavigationProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedOppositeNavigationProperty.java
index 002c2a4..38a0311 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedOppositeNavigationProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/UnboxedOppositeNavigationProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink(CEA LIST) - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorEnumeration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorEnumeration.java
index b163299..73b055f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorEnumeration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorEnumeration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorEnumerationLiteral.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorEnumerationLiteral.java
index 01b98ba..d963193 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorEnumerationLiteral.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorEnumerationLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorInvalidType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorInvalidType.java
index 9ab12f7..26a63ec 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorInvalidType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorInvalidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorManager.java
index 9e0832d..12f2364 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorPackage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorPackage.java
index 59c7646..69efc0d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorProperty.java
index 171972d..1ca5772 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorType.java
index c85cf21..64cfc4c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorVoidType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorVoidType.java
index e307447..9dbfc2f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorVoidType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreExecutorVoidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreIdResolver.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreIdResolver.java
index 346b19c..597c67c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreIdResolver.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreIdResolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreLibraryOppositeProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreLibraryOppositeProperty.java
index 0909a86..614ad4f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreLibraryOppositeProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreLibraryOppositeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreLibraryProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreLibraryProperty.java
index e039839..6d410ae 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreLibraryProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreLibraryProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveEnumeration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveEnumeration.java
index 8b5906a..e07d7ae 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveEnumeration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveEnumeration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveFragment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveFragment.java
index 98910f4..7888cff 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveFragment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectivePackage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectivePackage.java
index a74f990..a37881c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectivePackage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectivePackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveType.java
index 5c6c569..53b5549 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/ecore/EcoreReflectiveType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractDispatchOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractDispatchOperation.java
index abe5e15..bd38b73 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractDispatchOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractDispatchOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractEvaluationOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractEvaluationOperation.java
index c7eb770..0488a10 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractEvaluationOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractEvaluationOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractIdResolver.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractIdResolver.java
index 22c28bc..fc7fd0b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractIdResolver.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractIdResolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractReflectiveInheritanceType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractReflectiveInheritanceType.java
index c732e70..52840ef 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractReflectiveInheritanceType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/AbstractReflectiveInheritanceType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainProperties.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainProperties.java
index 2e104d2..6babddc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainProperties.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainProperties.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectiveFragment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectiveFragment.java
index f208353..7d2ead5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectiveFragment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectiveFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectivePackage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectivePackage.java
index 7a6a434..3965011 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectivePackage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectivePackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectiveType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectiveType.java
index c7ba2aa..2677d00 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectiveType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/DomainReflectiveType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutableStandardLibrary.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutableStandardLibrary.java
index bc099fc..513e55d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutableStandardLibrary.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutableStandardLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorDoubleIterationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorDoubleIterationManager.java
index 4e37f37..237c7b0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorDoubleIterationManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorDoubleIterationManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorEnumerationLiteral.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorEnumerationLiteral.java
index 3881542..ec6829a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorEnumerationLiteral.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorEnumerationLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorFragment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorFragment.java
index 4b77d0b..e82bf45 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorFragment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorLambdaType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorLambdaType.java
index af7c154..1e05bd4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorLambdaType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorLambdaType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorManager.java
index 051a9b6..15d23f9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorOperation.java
index 5fc26a9..c75e4cb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorPackage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorPackage.java
index 77271b1..d7ef465 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorProperty.java
index 55752f0..624681e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorPropertyWithImplementation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorPropertyWithImplementation.java
index f2730b3..77edc64 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorPropertyWithImplementation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorPropertyWithImplementation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorSingleIterationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorSingleIterationManager.java
index 61f4a55..265d141 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorSingleIterationManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorSingleIterationManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorSpecializedType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorSpecializedType.java
index 2dbb6f4..1813027 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorSpecializedType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorSpecializedType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorStandardLibrary.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorStandardLibrary.java
index 754234f..2e790bc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorStandardLibrary.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorStandardLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTupleType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTupleType.java
index 9aea6ee..7f4ec50 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTupleType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTupleType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorType.java
index 81fe78d..335cc99 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTypeArgument.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTypeArgument.java
index 72068fb..22a5e53 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTypeArgument.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTypeArgument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTypeParameter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTypeParameter.java
index 9415722..6abe95e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTypeParameter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ExecutorTypeParameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/JavaType.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/JavaType.java
index e049d3d..768293a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/JavaType.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/JavaType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/LazyModelManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/LazyModelManager.java
index d045919..74f2ec2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/LazyModelManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/LazyModelManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectiveFragment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectiveFragment.java
index 0be89e9..052fe3a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectiveFragment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectiveFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectiveInheritance.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectiveInheritance.java
index 9695842..37e29aa 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectiveInheritance.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectiveInheritance.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectivePackage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectivePackage.java
index 0d8fe44..208a3f5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectivePackage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/library/executor/ReflectivePackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/FinalAnalysis.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/FinalAnalysis.java
index f4d3dbb..59cba4e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/FinalAnalysis.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/FinalAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/FlowAnalysis.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/FlowAnalysis.java
index d521e56..76b0b3a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/FlowAnalysis.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/FlowAnalysis.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/LambdaTypeManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/LambdaTypeManager.java
index fa60a05..d7d7811 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/LambdaTypeManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/LambdaTypeManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/MetamodelManagerInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/MetamodelManagerInternal.java
index 98480d6..8e9b3fd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/MetamodelManagerInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/MetamodelManagerInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 20185 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/OperationArguments.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/OperationArguments.java
index 9136a23..7ada8e1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/OperationArguments.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/OperationArguments.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/Orphanage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/Orphanage.java
index 4750569..2faf312 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/Orphanage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/Orphanage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotExecutorManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotExecutorManager.java
index 60f45ad..24fa6c6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotExecutorManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotExecutorManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotIdResolver.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotIdResolver.java
index 59220c7..77864d3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotIdResolver.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotIdResolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotMetamodelManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotMetamodelManager.java
index 0cfbc83..d8522db 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotMetamodelManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotMetamodelManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PrecedenceManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PrecedenceManager.java
index 0eff542..ea49979 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PrecedenceManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PrecedenceManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateParameterSubstitutionHelper.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateParameterSubstitutionHelper.java
index c3b4477..d71c988 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateParameterSubstitutionHelper.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateParameterSubstitutionHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateParameterSubstitutionVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateParameterSubstitutionVisitor.java
index 9a8fb94..a26c780 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateParameterSubstitutionVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateParameterSubstitutionVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateSpecialisation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateSpecialisation.java
index 96974d1..f9da6f8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateSpecialisation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TemplateSpecialisation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TupleTypeManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TupleTypeManager.java
index 834ed91..39f56f9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TupleTypeManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/TupleTypeManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/messages/PivotMessagesInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/messages/PivotMessagesInternal.java
index 11f3ab0..b445314 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/messages/PivotMessagesInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/messages/PivotMessagesInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/messages/PivotMessagesInternal.properties b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/messages/PivotMessagesInternal.properties
index 1411bfd..0b2278a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/messages/PivotMessagesInternal.properties
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/messages/PivotMessagesInternal.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/ASResourceFactoryRegistryReader.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/ASResourceFactoryRegistryReader.java
index f960dcc..eac9778 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/ASResourceFactoryRegistryReader.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/ASResourceFactoryRegistryReader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/CompleteOCLRegistryReader.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/CompleteOCLRegistryReader.java
index 3853cd3..59e1da3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/CompleteOCLRegistryReader.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/CompleteOCLRegistryReader.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/LabelGeneratorRegistryReader.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/LabelGeneratorRegistryReader.java
index 75086a3..41b445d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/LabelGeneratorRegistryReader.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/LabelGeneratorRegistryReader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/PivotPreferenceInitializer.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/PivotPreferenceInitializer.java
index a787d02..680cc11 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/PivotPreferenceInitializer.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/PivotPreferenceInitializer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/StandardLibraryRegistryReader.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/StandardLibraryRegistryReader.java
index 936a48c..c47cb54 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/StandardLibraryRegistryReader.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/plugin/StandardLibraryRegistryReader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/EssentialOCLPrettyPrintVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/EssentialOCLPrettyPrintVisitor.java
index af48759..6417920 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/EssentialOCLPrettyPrintVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/EssentialOCLPrettyPrintVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrintOptions.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrintOptions.java
index 65bcbed..1e999a4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrintOptions.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrintOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrintVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrintVisitor.java
index 81fbe9c..686b6ce 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrintVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrintVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrinter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrinter.java
index 1cf1be3..88cc213 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrinter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/prettyprint/PrettyPrinter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/registry/CompleteOCLRegistry.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/registry/CompleteOCLRegistry.java
index e7a80b2..a6fbbc3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/registry/CompleteOCLRegistry.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/registry/CompleteOCLRegistry.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AS2ID.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AS2ID.java
index c86505d..72b65a3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AS2ID.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AS2ID.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactory.java
index b700ed4..06cf3b4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactoryContribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactoryContribution.java
index b9eb6b5..e8fa727 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactoryContribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactoryContribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactoryRegistry.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactoryRegistry.java
index 8d01e38..4d310c8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactoryRegistry.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceFactoryRegistry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceImpl.java
index 170004c..76262a6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASResourceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASSaver.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASSaver.java
index 801fced..5571d9f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASSaver.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ASSaver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AbstractASResourceFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AbstractASResourceFactory.java
index 8037725..4802d39 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AbstractASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/AbstractASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/EnvironmentFactoryAdapter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/EnvironmentFactoryAdapter.java
index c0661ce..b4fca01 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/EnvironmentFactoryAdapter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/EnvironmentFactoryAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ICSI2ASMapping.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ICSI2ASMapping.java
index 97ba9d3..79c7024 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ICSI2ASMapping.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ICSI2ASMapping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/LUSSIDs.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/LUSSIDs.java
index cc2054d..7339d15 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/LUSSIDs.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/LUSSIDs.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/OCLASResourceFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/OCLASResourceFactory.java
index 307131f..8831071 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/OCLASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/OCLASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/OCLAdapter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/OCLAdapter.java
index b500100..c6d9af3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/OCLAdapter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/OCLAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PivotLUSSIDs.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PivotLUSSIDs.java
index 40a96a3..e536d00 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PivotLUSSIDs.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PivotLUSSIDs.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PivotSaveImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PivotSaveImpl.java
index 4650cff..3584c31 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PivotSaveImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PivotSaveImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PlatformURIHandlerImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PlatformURIHandlerImpl.java
index 0dff12f..14e4760 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PlatformURIHandlerImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/PlatformURIHandlerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ProjectMap.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ProjectMap.java
index b8f4680..e8ba5e9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ProjectMap.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/ProjectMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/StandalonePlatformURIHandlerImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/StandalonePlatformURIHandlerImpl.java
index bb4b2c2..245cb7b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/StandalonePlatformURIHandlerImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/StandalonePlatformURIHandlerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/StandaloneProjectMap.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/StandaloneProjectMap.java
index 6008be5..0ed30d3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/StandaloneProjectMap.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/resource/StandaloneProjectMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/AbstractAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/AbstractAttribution.java
index 26615b4..abc54ac 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/AbstractAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/AbstractAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/Attribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/Attribution.java
index f28157f..1218f92 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/Attribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/Attribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/DebugEmptyAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/DebugEmptyAttribution.java
index fd1edc2..eea9a1a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/DebugEmptyAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/DebugEmptyAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/EmptyAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/EmptyAttribution.java
index 58336fa..f9a309e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/EmptyAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/EmptyAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/EnvironmentView.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/EnvironmentView.java
index a7ac905..387fdad 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/EnvironmentView.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/EnvironmentView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/NullAttribution.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/NullAttribution.java
index 3799eb4..1b2375c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/NullAttribution.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/NullAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/PivotScopeView.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/PivotScopeView.java
index c24cfec..366fc3a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/PivotScopeView.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/PivotScopeView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/PivotScoping.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/PivotScoping.java
index 46869ee..6b2eb17 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/PivotScoping.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/PivotScoping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/ScopeFilter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/ScopeFilter.java
index d751a2e..5b76bbb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/ScopeFilter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/ScopeFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/ScopeView.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/ScopeView.java
index 2d25827..3e7c901 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/ScopeView.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/scoping/ScopeView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AS2Moniker.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AS2Moniker.java
index 158cf79..7832bc2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AS2Moniker.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AS2Moniker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AS2XMIid.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AS2XMIid.java
index e326df1..97d97e4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AS2XMIid.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AS2XMIid.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractContents.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractContents.java
index 38ce409..3ea8071 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractContents.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractContents.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractConversion.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractConversion.java
index ce83115..fd5379f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractConversion.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractConversion.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractTechnology.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractTechnology.java
index 0888a69..a8e7787 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractTechnology.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AbstractTechnology.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AliasAdapter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AliasAdapter.java
index b4c74e2..2bb524e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AliasAdapter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/AliasAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/CompleteElementIterable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/CompleteElementIterable.java
index be112dc..d188342 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/CompleteElementIterable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/CompleteElementIterable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/EcoreTechnology.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/EcoreTechnology.java
index 4df7249..64eea7e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/EcoreTechnology.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/EcoreTechnology.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/EnvironmentFactoryInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/EnvironmentFactoryInternal.java
index ef1de4c..4e38f30 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/EnvironmentFactoryInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/EnvironmentFactoryInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/External2AS.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/External2AS.java
index f0f27c4..aa1cb52 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/External2AS.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/External2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/GlobalEnvironmentFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/GlobalEnvironmentFactory.java
index bae3cc4..e87891f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/GlobalEnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/GlobalEnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/HTMLBuffer.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/HTMLBuffer.java
index 49e1792..5d68c62 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/HTMLBuffer.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/HTMLBuffer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/IllegalLibraryException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/IllegalLibraryException.java
index 036b2e0..4570e08 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/IllegalLibraryException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/IllegalLibraryException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/IllegalMetamodelException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/IllegalMetamodelException.java
index 1f76af5..32ebcb6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/IllegalMetamodelException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/IllegalMetamodelException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/LazyXMIidAssigningResourceImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/LazyXMIidAssigningResourceImpl.java
index ee093b7..68609a9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/LazyXMIidAssigningResourceImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/LazyXMIidAssigningResourceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/LiveInstances.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/LiveInstances.java
index 512d348..d46d266 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/LiveInstances.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/LiveInstances.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLDebugOptions.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLDebugOptions.java
index 25caa64..cd8591a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLDebugOptions.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLDebugOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLInput.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLInput.java
index 351d2a2..8ec1f0f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLInput.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLInput.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLInternal.java
index e57545b..fa1e301 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/OCLInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PathElement.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PathElement.java
index e3b369c..e96ba6d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PathElement.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PathElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotConstantsInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotConstantsInternal.java
index 9e0cb77..49e6f38 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotConstantsInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotConstantsInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotDiagnostician.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotDiagnostician.java
index 76c49c3..faf4182 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotDiagnostician.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotDiagnostician.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotEnvironmentFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotEnvironmentFactory.java
index 25c9084..99c3d34 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotEnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotEnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotObjectImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotObjectImpl.java
index 0063b9a..d09c170 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotObjectImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotObjectImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotUtilInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotUtilInternal.java
index 16ccb1d..6a58dcb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotUtilInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/PivotUtilInternal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/ProblemAware.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/ProblemAware.java
index c3543bd..2f89687 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/ProblemAware.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/ProblemAware.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Borland Software Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Radek Dvorak - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/Technology.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/Technology.java
index 5dc398c..40f2e3e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/Technology.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/utilities/Technology.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/BasicEAnnotationValidator2.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/BasicEAnnotationValidator2.java
index 25a7aa4..6c08d58 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/BasicEAnnotationValidator2.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/BasicEAnnotationValidator2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java
index cbe5ab0..25c222a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/EcoreOCLEValidator.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/Ecore_OCL_AnnotationValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/Ecore_OCL_AnnotationValidator.java
index a766079..f1c71a0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/Ecore_OCL_AnnotationValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/Ecore_OCL_AnnotationValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_ASLibrary_AnnotationValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_ASLibrary_AnnotationValidator.java
index 1fed46b..e2098d8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_ASLibrary_AnnotationValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_ASLibrary_AnnotationValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_ASMetamodel_AnnotationValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_ASMetamodel_AnnotationValidator.java
index d9ab4fb..73feb85 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_ASMetamodel_AnnotationValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_ASMetamodel_AnnotationValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_Collection_AnnotationValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_Collection_AnnotationValidator.java
index 6f1b77e..9969500 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_Collection_AnnotationValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_Collection_AnnotationValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_Import_AnnotationValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_Import_AnnotationValidator.java
index 870e31c..081a0f2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_Import_AnnotationValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_Import_AnnotationValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_MetaAnnotation_AnnotationValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_MetaAnnotation_AnnotationValidator.java
index 250a714..1d9d49d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_MetaAnnotation_AnnotationValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/OCL_MetaAnnotation_AnnotationValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/PivotEAnnotationValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/PivotEAnnotationValidator.java
index 2f60a39..0e5682d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/PivotEAnnotationValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/PivotEAnnotationValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/PivotEObjectValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/PivotEObjectValidator.java
index f798d16..c663f4b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/PivotEObjectValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/validation/PivotEObjectValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BagImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BagImpl.java
index 05166ca..483543f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BagImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BagImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Christian W. Damus - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BagValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BagValueImpl.java
index 463f4d9..b11ac28 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BagValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BagValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BigIntegerValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BigIntegerValueImpl.java
index f2c2ae1..587bb50 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BigIntegerValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/BigIntegerValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/CollectionTypeParametersImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/CollectionTypeParametersImpl.java
index cf93433..4feedfb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/CollectionTypeParametersImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/CollectionTypeParametersImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/CollectionValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/CollectionValueImpl.java
index 5af3662..44af2b2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/CollectionValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/CollectionValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntIntegerValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntIntegerValueImpl.java
index 56a5527..24414d2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntIntegerValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntIntegerValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntegerRangeImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntegerRangeImpl.java
index f3c1bba..5f79adc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntegerRangeImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntegerRangeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntegerValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntegerValueImpl.java
index 8274094..acd1f9c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntegerValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/IntegerValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/JavaObjectValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/JavaObjectValueImpl.java
index e42c034..6dfb2f1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/JavaObjectValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/JavaObjectValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/LongIntegerValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/LongIntegerValueImpl.java
index f5c0fb9..6b17624 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/LongIntegerValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/LongIntegerValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapEntryImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapEntryImpl.java
index cc09dac..beed168 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapEntryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapEntryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapTypeParametersImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapTypeParametersImpl.java
index 33c9fcc..6947fe0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapTypeParametersImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapTypeParametersImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapValueImpl.java
index f59ae65..f6a0178 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/MapValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/NullValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/NullValueImpl.java
index fb18c1a..5501cb6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/NullValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/NullValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/NumberValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/NumberValueImpl.java
index d319b30..42d8881 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/NumberValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/NumberValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ObjectValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ObjectValueImpl.java
index 51e972b..75519b0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ObjectValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ObjectValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/OrderedSetImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/OrderedSetImpl.java
index c1bae66..ece908d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/OrderedSetImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/OrderedSetImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/OrderedSetValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/OrderedSetValueImpl.java
index 5d3d0f1..07501cf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/OrderedSetValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/OrderedSetValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RangeOrderedSetValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RangeOrderedSetValueImpl.java
index 77e1155..e818cd7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RangeOrderedSetValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RangeOrderedSetValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RangeSequenceValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RangeSequenceValueImpl.java
index 7336f8d..2be1a16 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RangeSequenceValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RangeSequenceValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RealValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RealValueImpl.java
index fb2f8a6..e0985b0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RealValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/RealValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SequenceValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SequenceValueImpl.java
index 02db10a..7cb17dc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SequenceValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SequenceValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SetValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SetValueImpl.java
index 515a5b2..057a893 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SetValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SetValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SparseOrderedSetValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SparseOrderedSetValueImpl.java
index f3226f34..7df7696 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SparseOrderedSetValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SparseOrderedSetValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SparseSequenceValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SparseSequenceValueImpl.java
index 2a29c36..0863a3b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SparseSequenceValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/SparseSequenceValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/TupleValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/TupleValueImpl.java
index ea3c923..5353d1e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/TupleValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/TupleValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/UndefinedValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/UndefinedValueImpl.java
index a1edb67..9419a04 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/UndefinedValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/UndefinedValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/UnlimitedValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/UnlimitedValueImpl.java
index e911dc8..e6400c6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/UnlimitedValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/UnlimitedValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValueImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValueImpl.java
index c58e361..0701c90 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValueImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValuesFactoryImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValuesFactoryImpl.java
index 15cf942..de055d3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValuesFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValuesFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValuesPackageImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValuesPackageImpl.java
index eb338b7..d5284fa 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValuesPackageImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/values/ValuesPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/AbstractLabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/AbstractLabelGenerator.java
index 82aaf9c..636d61b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/AbstractLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/AbstractLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/AbstractLabelGeneratorBuilder.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/AbstractLabelGeneratorBuilder.java
index 928eb69..52d98eb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/AbstractLabelGeneratorBuilder.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/AbstractLabelGeneratorBuilder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/DefaultLabelGeneratorBuilder.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/DefaultLabelGeneratorBuilder.java
index 69b1945..57ad22c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/DefaultLabelGeneratorBuilder.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/DefaultLabelGeneratorBuilder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/ILabelGenerator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/ILabelGenerator.java
index 6326c64..5afb4de 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/ILabelGenerator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/ILabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/Label.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/Label.java
index 30da245..a370e27 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/Label.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/Label.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/LabelGeneratorRegistry.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/LabelGeneratorRegistry.java
index 65fa22e..e4c5362 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/LabelGeneratorRegistry.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/labels/LabelGeneratorRegistry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractBinaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractBinaryOperation.java
index cd77a3b..8d96ac2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractBinaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractBinaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractEvaluatorIterationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractEvaluatorIterationManager.java
index 133c60d..a275967 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractEvaluatorIterationManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractEvaluatorIterationManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractFeature.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractFeature.java
index 5407ec1..7641f5f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractFeature.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractFeature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIteration.java
index 1052994..9c8d13f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIterationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIterationManager.java
index caebdce..2f87434 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIterationManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractIterationManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractOperation.java
index 098dd31..cafa17f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractPolyOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractPolyOperation.java
index 0a25a25..3e37192 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractPolyOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractPolyOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractProperty.java
index 13fdd82..c81f2ba 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleBinaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleBinaryOperation.java
index 79c4cc6..a1c0827 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleBinaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleBinaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleTernaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleTernaryOperation.java
index 20465c3..6c57e54 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleTernaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleTernaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleUnaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleUnaryOperation.java
index e309d1d..7770b34 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleUnaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractSimpleUnaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractTernaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractTernaryOperation.java
index 2506294..439bd59 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractTernaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractTernaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUnaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUnaryOperation.java
index 172cd4e..20cfb16 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUnaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUnaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedBinaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedBinaryOperation.java
index 811b66d..2f12fe4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedBinaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedBinaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedTernaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedTernaryOperation.java
index c04d62f..a326dbb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedTernaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedTernaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedUnaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedUnaryOperation.java
index 38f388f..9fab8be 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedUnaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/AbstractUntypedUnaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/EvaluatorMultipleIterationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/EvaluatorMultipleIterationManager.java
index dd447b7..c8eae2f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/EvaluatorMultipleIterationManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/EvaluatorMultipleIterationManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/EvaluatorSingleIterationManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/EvaluatorSingleIterationManager.java
index 01d131e..6fb1e08 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/EvaluatorSingleIterationManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/EvaluatorSingleIterationManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryBinaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryBinaryOperation.java
index 1ea6436..3567879 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryBinaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryBinaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryConstants.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryConstants.java
index 8473a27..a8c158c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryConstants.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryFeature.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryFeature.java
index d18bff7..651555e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryFeature.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryFeature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryIteration.java
index 087daf3..514e87c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryOperation.java
index 15bd9a4..86e2f9b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryProperty.java
index a3cd7b3..5edde9d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleBinaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleBinaryOperation.java
index 790fd56..6489b46 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleBinaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleBinaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleOperation.java
index 94b908c..5feee63 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleTernaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleTernaryOperation.java
index b8f696d..123a656 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleTernaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleTernaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleUnaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleUnaryOperation.java
index 9151ed7..56a61a0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleUnaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibrarySimpleUnaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryTernaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryTernaryOperation.java
index 42b4fc1..c40f3cb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryTernaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryTernaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUnaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUnaryOperation.java
index ced0aac..a015c43 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUnaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUnaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedBinaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedBinaryOperation.java
index 5a56727..1c29b07 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedBinaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedBinaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedOperation.java
index 7da18f9..1f6f3d0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedTernaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedTernaryOperation.java
index b7cb38e..675da9f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedTernaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedTernaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedUnaryOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedUnaryOperation.java
index 0dba4e6..dbfb2eb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedUnaryOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryUntypedUnaryOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryValidator.java
index bc53a2f..dd063d0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/LibraryValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/UnsupportedOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/UnsupportedOperation.java
index c9a7c1c..183869b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/UnsupportedOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/UnsupportedOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierAllInstancesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierAllInstancesOperation.java
index 28a5e7e..1da9741 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierAllInstancesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierAllInstancesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierOclContainerOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierOclContainerOperation.java
index a7ab588..3661fef 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierOclContainerOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierOclContainerOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierOclContentsOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierOclContentsOperation.java
index 044e8ed..d576f70 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierOclContentsOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/ClassifierOclContentsOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/OclTypeConformsToOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/OclTypeConformsToOperation.java
index 27a5bee..1095547 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/OclTypeConformsToOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/classifier/OclTypeConformsToOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsBagOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsBagOperation.java
index 5e19763..4245cc8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsBagOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsBagOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsOrderedSetOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsOrderedSetOperation.java
index 41172bf..1ec5580 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsOrderedSetOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsOrderedSetOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsSequenceOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsSequenceOperation.java
index b8d4ba2..8d43305 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsSequenceOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsSequenceOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsSetOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsSetOperation.java
index e67b5ab..4d91ca8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsSetOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionAsSetOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionCountOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionCountOperation.java
index 020c955..ae54171 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionCountOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionCountOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionElementTypeProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionElementTypeProperty.java
index 9a81704..7e3b1c2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionElementTypeProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionElementTypeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludesAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludesAllOperation.java
index 15fd0c6..e716032 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludesAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludesAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludesOperation.java
index f841ded..1ed8afc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludingAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludingAllOperation.java
index c17c80f..d45c69c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludingAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludingAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludingOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludingOperation.java
index 7f08884..ee681f0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludingOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionExcludingOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionFlattenOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionFlattenOperation.java
index ca2d115..54cd4b2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionFlattenOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionFlattenOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludesAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludesAllOperation.java
index ca9e00e..3300f81 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludesAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludesAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludesOperation.java
index a21b382..b9126e7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludingAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludingAllOperation.java
index 48a9efd..4e84242 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludingAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludingAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludingOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludingOperation.java
index ad6be0f..92b82a1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludingOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIncludingOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIntersectionOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIntersectionOperation.java
index 27765e6..c9ac813 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIntersectionOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIntersectionOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIsEmptyOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIsEmptyOperation.java
index e8944dd..91ed618 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIsEmptyOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionIsEmptyOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionLowerProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionLowerProperty.java
index 460e42b..713a832 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionLowerProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionLowerProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionMaxOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionMaxOperation.java
index e97e34e..b554409 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionMaxOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionMaxOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionMinOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionMinOperation.java
index d5d5329..9ccbd88 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionMinOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionMinOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionNotEmptyOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionNotEmptyOperation.java
index 4de27c1..c315906 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionNotEmptyOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionNotEmptyOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionProductOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionProductOperation.java
index da51da1..3685dba 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionProductOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionProductOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSelectByKindOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSelectByKindOperation.java
index aae671f..ed3aa0d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSelectByKindOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSelectByKindOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSelectByTypeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSelectByTypeOperation.java
index c54056d..3448400 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSelectByTypeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSelectByTypeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSizeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSizeOperation.java
index a3cc5a6..2de6933 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSizeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSizeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSumOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSumOperation.java
index 181028a..1c67ec0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSumOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionSumOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionUnionOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionUnionOperation.java
index 589abad..050a513 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionUnionOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionUnionOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionUpperProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionUpperProperty.java
index 29086e0..f406049 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionUpperProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/CollectionUpperProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAppendAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAppendAllOperation.java
index 48bc1f4..96465a7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAppendAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAppendAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAppendOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAppendOperation.java
index 9646df1..762cda6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAppendOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAppendOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAtOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAtOperation.java
index 764fbb6..abd73d7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAtOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionAtOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionFirstOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionFirstOperation.java
index 47b78c8..ff0887a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionFirstOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionFirstOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionIndexOfOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionIndexOfOperation.java
index b2c9b33..785be6c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionIndexOfOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionIndexOfOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionInsertAtOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionInsertAtOperation.java
index a1d40b1..a4faa0f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionInsertAtOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionInsertAtOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionLastOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionLastOperation.java
index 4ed0c6c..0954dc7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionLastOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionLastOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionPrependAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionPrependAllOperation.java
index 72420c9..9a9c76b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionPrependAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionPrependAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionPrependOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionPrependOperation.java
index 353af7d..7b06744 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionPrependOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionPrependOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionReverseOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionReverseOperation.java
index d5a2bdf..93ad6b9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionReverseOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedCollectionReverseOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedSetSubOrderedSetOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedSetSubOrderedSetOperation.java
index ac07170..c4d063f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedSetSubOrderedSetOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/OrderedSetSubOrderedSetOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SequenceSubSequenceOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SequenceSubSequenceOperation.java
index 99d58cf..a993f8c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SequenceSubSequenceOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SequenceSubSequenceOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SetMinusOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SetMinusOperation.java
index 1f6d37e..c303d0f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SetMinusOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SetMinusOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SetSymmetricDifferenceOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SetSymmetricDifferenceOperation.java
index 29e428d..fcb8ac4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SetSymmetricDifferenceOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/collection/SetSymmetricDifferenceOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/enumeration/EnumerationAllInstancesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/enumeration/EnumerationAllInstancesOperation.java
index 86bf6d2..285e41d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/enumeration/EnumerationAllInstancesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/enumeration/EnumerationAllInstancesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/enumeration/EnumerationOwnedLiteralProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/enumeration/EnumerationOwnedLiteralProperty.java
index 3943807..f3282c2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/enumeration/EnumerationOwnedLiteralProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/enumeration/EnumerationOwnedLiteralProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/AnyIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/AnyIteration.java
index 58e4643..fd4b649 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/AnyIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/AnyIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ClosureIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ClosureIteration.java
index 3e3a671..8436100 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ClosureIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ClosureIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/CollectIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/CollectIteration.java
index 0716707..29c9c62 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/CollectIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/CollectIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/CollectNestedIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/CollectNestedIteration.java
index cf827ff..a0a97a4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/CollectNestedIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/CollectNestedIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ExistsIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ExistsIteration.java
index b7498b5..f049549 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ExistsIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ExistsIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ForAllIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ForAllIteration.java
index 76e4333..1c852c6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ForAllIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/ForAllIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/IsUniqueIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/IsUniqueIteration.java
index 1602bab..2129081 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/IsUniqueIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/IsUniqueIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/IterateIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/IterateIteration.java
index f78557d..be8b819 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/IterateIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/IterateIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/OneIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/OneIteration.java
index d9fcd28..30ac4eb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/OneIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/OneIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/OnlyIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/OnlyIteration.java
index 918c898..0b85590 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/OnlyIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/OnlyIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/RejectIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/RejectIteration.java
index cb719f5..9e760c2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/RejectIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/RejectIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/SelectIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/SelectIteration.java
index a6244d4..74d541f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/SelectIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/SelectIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/SortedByIteration.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/SortedByIteration.java
index 8e74f6d..ab2f0b2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/SortedByIteration.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/iterator/SortedByIteration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAllInstancesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAllInstancesOperation.java
index 380b9b9..e15d389 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAllInstancesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAllInstancesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAndOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAndOperation.java
index fe35831..0207fbf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAndOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAndOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAndOperation2.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAndOperation2.java
index e572b38..ba582d5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAndOperation2.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanAndOperation2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanImpliesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanImpliesOperation.java
index a853b1b..c73c24c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanImpliesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanImpliesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanImpliesOperation2.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanImpliesOperation2.java
index 0cbb7ce..c39486c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanImpliesOperation2.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanImpliesOperation2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanNotOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanNotOperation.java
index a29475c..32e1e85 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanNotOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanNotOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanNotOperation2.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanNotOperation2.java
index d042304..a5159b7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanNotOperation2.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanNotOperation2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanOrOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanOrOperation.java
index d9c99ff..95bbc26 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanOrOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanOrOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanOrOperation2.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanOrOperation2.java
index ab150ac..45c5f8b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanOrOperation2.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanOrOperation2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanXorOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanXorOperation.java
index a4b7fb8..9966dc6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanXorOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanXorOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanXorOperation2.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanXorOperation2.java
index ac0db03..b1984c7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanXorOperation2.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/logical/BooleanXorOperation2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapAtOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapAtOperation.java
index 4804ca4..2f8109f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapAtOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapAtOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesAllOperation.java
index 151e20d..ab96d9b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesMapOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesMapOperation.java
index bdd4727..153d945 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesMapOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesMapOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesOperation.java
index 044633c..6be6aa3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesPairOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesPairOperation.java
index d25316a..b00d082 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesPairOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesPairOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesValueOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesValueOperation.java
index d41cb99..374cf62 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesValueOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludesValueOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingAllOperation.java
index 789293f..af03934 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingMapOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingMapOperation.java
index e1bac03..04b0559 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingMapOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingMapOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingOperation.java
index 15c8e26..a9b45be 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingPairOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingPairOperation.java
index 0e30867..b8821cf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingPairOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapExcludingPairOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesAllOperation.java
index d6a4ced..1cea852 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesMapOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesMapOperation.java
index 3f5c777..8bbde61 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesMapOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesMapOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesOperation.java
index af5cdc1..925af25 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesPairOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesPairOperation.java
index 3ca39a9..87f564f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesPairOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesPairOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesValueOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesValueOperation.java
index 5be1319..507677b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesValueOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludesValueOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludingMapOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludingMapOperation.java
index 59742ef..43f75c5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludingMapOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludingMapOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludingPairOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludingPairOperation.java
index e3616ab..d101c06 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludingPairOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIncludingPairOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIsEmptyOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIsEmptyOperation.java
index 268cc8e..9332ebc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIsEmptyOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapIsEmptyOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapKeyTypeProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapKeyTypeProperty.java
index 1e507c0..1647c14 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapKeyTypeProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapKeyTypeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapKeysOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapKeysOperation.java
index 091a3bd..5c37c9c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapKeysOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapKeysOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapNotEmptyOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapNotEmptyOperation.java
index cf47040..3c82743 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapNotEmptyOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapNotEmptyOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapSizeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapSizeOperation.java
index c64e47d..9ce424c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapSizeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapSizeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapValueTypeProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapValueTypeProperty.java
index e976bdb..5a896ee 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapValueTypeProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapValueTypeProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapValuesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapValuesOperation.java
index 8d98295..c0aef68 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapValuesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/map/MapValuesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/IntegerToUnlimitedNaturalOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/IntegerToUnlimitedNaturalOperation.java
index 547b0fe..4973e59 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/IntegerToUnlimitedNaturalOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/IntegerToUnlimitedNaturalOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericAbsOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericAbsOperation.java
index 4da76b2..90b3c2b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericAbsOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericAbsOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericCompareToOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericCompareToOperation.java
index 9bf8d78..0d7dc1c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericCompareToOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericCompareToOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericDivOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericDivOperation.java
index be97aa1..abfcbe2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericDivOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericDivOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericDivideOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericDivideOperation.java
index 3214ae7..119cd7f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericDivideOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericDivideOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericFloorOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericFloorOperation.java
index 297b1f1..3ba66bb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericFloorOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericFloorOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericGreaterThanEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericGreaterThanEqualOperation.java
index 74f5173..9adf266 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericGreaterThanEqualOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericGreaterThanEqualOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericGreaterThanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericGreaterThanOperation.java
index bfcd530..8f0d221 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericGreaterThanOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericGreaterThanOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericLessThanEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericLessThanEqualOperation.java
index 18996c2..5385885 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericLessThanEqualOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericLessThanEqualOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericLessThanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericLessThanOperation.java
index 05341eb..b4a0da1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericLessThanOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericLessThanOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMaxOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMaxOperation.java
index 4f66d23..ae11b1a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMaxOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMaxOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMinOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMinOperation.java
index 480b54c..476cb9b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMinOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMinOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMinusOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMinusOperation.java
index 9817fc7..b3a4e96 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMinusOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericMinusOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericModOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericModOperation.java
index a33d2a2..89e61e7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericModOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericModOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericNegateOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericNegateOperation.java
index 11570a3..b47dd0e 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericNegateOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericNegateOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericPlusOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericPlusOperation.java
index da044fd..5057541 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericPlusOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericPlusOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericRoundOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericRoundOperation.java
index 1972d6f..4c05525 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericRoundOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericRoundOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericTimesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericTimesOperation.java
index 332fd78..05cef86 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericTimesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/NumericTimesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalMaxOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalMaxOperation.java
index 09ea0b8..757f235 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalMaxOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalMaxOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalMinOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalMinOperation.java
index 707ce3b..b4d69a5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalMinOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalMinOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalOclAsTypeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalOclAsTypeOperation.java
index e1e5878..380dadb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalOclAsTypeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalOclAsTypeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalToIntegerOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalToIntegerOperation.java
index cf319ac..f618f6a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalToIntegerOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/numeric/UnlimitedNaturalToIntegerOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyEqualOperation.java
index 6c97697..4e34b9b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyEqualOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyEqualOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyNotEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyNotEqualOperation.java
index 72ef2fa..fe5129b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyNotEqualOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyNotEqualOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclAsSetOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclAsSetOperation.java
index ae3e4ea..cde96f5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclAsSetOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclAsSetOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclAsTypeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclAsTypeOperation.java
index ed4fd28..637cd75 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclAsTypeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclAsTypeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsInStateOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsInStateOperation.java
index 5f66a73..abd79d5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsInStateOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsInStateOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsInvalidOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsInvalidOperation.java
index 913dff2..7809081 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsInvalidOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsInvalidOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsKindOfOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsKindOfOperation.java
index 48b635b..a1b461b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsKindOfOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsKindOfOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsTypeOfOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsTypeOfOperation.java
index a4d9cfc..f9acde3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsTypeOfOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsTypeOfOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsUndefinedOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsUndefinedOperation.java
index 9388418..c77586a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsUndefinedOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclIsUndefinedOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclLogOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclLogOperation.java
index d7d3139..7b84f5a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclLogOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclLogOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclTypeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclTypeOperation.java
index b15a14f..8d962cf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclTypeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclTypeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclTypesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclTypesOperation.java
index a4fd1fa..e0a401a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclTypesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyOclTypesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyToStringOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyToStringOperation.java
index d79b8ce..92143cf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyToStringOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyToStringOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyUnsupportedOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyUnsupportedOperation.java
index c1dc3ce..e40d370 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyUnsupportedOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclAnyUnsupportedOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableCompareToOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableCompareToOperation.java
index a81e9a5..844c3df 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableCompareToOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableCompareToOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableComparisonOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableComparisonOperation.java
index 9a1bb96..0d0a956 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableComparisonOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableComparisonOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableGreaterThanEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableGreaterThanEqualOperation.java
index 57b1be8..4e4d48a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableGreaterThanEqualOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableGreaterThanEqualOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableGreaterThanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableGreaterThanOperation.java
index ee8abed..98dbed2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableGreaterThanOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableGreaterThanOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableLessThanEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableLessThanEqualOperation.java
index 28bf2ac..6309581 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableLessThanEqualOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableLessThanEqualOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableLessThanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableLessThanOperation.java
index bb37320..9b1bf7f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableLessThanOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclComparableLessThanOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclAsModelTypeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclAsModelTypeOperation.java
index 2cd7062..8f3fc54 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclAsModelTypeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclAsModelTypeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclContainerProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclContainerProperty.java
index 3e4756f..ea24187 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclContainerProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclContainerProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclContentsProperty.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclContentsProperty.java
index a39501d..486f9cb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclContentsProperty.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclContentsProperty.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclIsModelKindOfOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclIsModelKindOfOperation.java
index 152b479..2118b80 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclIsModelKindOfOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclIsModelKindOfOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclModelTypeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclModelTypeOperation.java
index e022e7d..396ec30 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclModelTypeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclModelTypeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclModelTypesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclModelTypesOperation.java
index 0d8e95d..7c91f68 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclModelTypesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclany/OclElementOclModelTypesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclinvalid/OclInvalidAllInstancesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclinvalid/OclInvalidAllInstancesOperation.java
index c6f68d5..29dc9d2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclinvalid/OclInvalidAllInstancesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclinvalid/OclInvalidAllInstancesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidAllInstancesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidAllInstancesOperation.java
index d91dade..49c6e75 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidAllInstancesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidAllInstancesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidAndOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidAndOperation.java
index 0fcf261..07dc1cd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidAndOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidAndOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidImpliesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidImpliesOperation.java
index 8c2931f..7b3f8ba 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidImpliesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidImpliesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidOrOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidOrOperation.java
index 6f559a4..8fc283a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidOrOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/oclvoid/OclVoidOrOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/CGStringGetSeverityOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/CGStringGetSeverityOperation.java
index 2f6fd72..4404f04 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/CGStringGetSeverityOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/CGStringGetSeverityOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/CGStringLogDiagnosticOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/CGStringLogDiagnosticOperation.java
index 85360c5..d1e5534 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/CGStringLogDiagnosticOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/CGStringLogDiagnosticOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringAtOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringAtOperation.java
index bbb3805..844ebf7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringAtOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringAtOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringCharactersOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringCharactersOperation.java
index 9c19b8e..f709326 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringCharactersOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringCharactersOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringCompareToOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringCompareToOperation.java
index c87f6ed..808639a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringCompareToOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringCompareToOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringConcatOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringConcatOperation.java
index 27b7188..daad741 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringConcatOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringConcatOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringEndsWithOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringEndsWithOperation.java
index f08c13e..0845583 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringEndsWithOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringEndsWithOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringEqualsIgnoreCaseOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringEqualsIgnoreCaseOperation.java
index a0b173a..f3a14ac 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringEqualsIgnoreCaseOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringEqualsIgnoreCaseOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanEqualOperation.java
index ce56692..c52e116 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanEqualOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanEqualOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanOperation.java
index 89ad366..8000bfa 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringGreaterThanOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringIndexOfOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringIndexOfOperation.java
index 087c1b2..ebe074c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringIndexOfOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringIndexOfOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLastIndexOfOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLastIndexOfOperation.java
index cbc1d33..9ae6f42 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLastIndexOfOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLastIndexOfOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanEqualOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanEqualOperation.java
index 2f7e5ef..f36a260 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanEqualOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanEqualOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanOperation.java
index a01463e..62329f3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringLessThanOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringMatchesOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringMatchesOperation.java
index 4de09ba..8830777 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringMatchesOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringMatchesOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringReplaceAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringReplaceAllOperation.java
index 86c5070..7258126 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringReplaceAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringReplaceAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringReplaceFirstOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringReplaceFirstOperation.java
index e0b6de7..6ed802b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringReplaceFirstOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringReplaceFirstOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSizeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSizeOperation.java
index 4348418..c37bacd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSizeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSizeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringStartsWithOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringStartsWithOperation.java
index a3b3adf..703cfbc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringStartsWithOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringStartsWithOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstituteAllOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstituteAllOperation.java
index 69888c5..e8881b2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstituteAllOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstituteAllOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstituteFirstOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstituteFirstOperation.java
index 1f9dc3e..3410174 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstituteFirstOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstituteFirstOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstringOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstringOperation.java
index 53a9e7b..60ea47f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstringOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringSubstringOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToBooleanOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToBooleanOperation.java
index ea0bed7..30d033a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToBooleanOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToBooleanOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToIntegerOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToIntegerOperation.java
index 8b9ce37..fb9ab9c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToIntegerOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToIntegerOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToLowerCaseOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToLowerCaseOperation.java
index 217ef6e..9306017 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToLowerCaseOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToLowerCaseOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToRealOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToRealOperation.java
index 9fa9872..af948bb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToRealOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToRealOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToUpperCaseOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToUpperCaseOperation.java
index 27370a3..f2e9d4b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToUpperCaseOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringToUpperCaseOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringTokenizeOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringTokenizeOperation.java
index 8308fdc..d8980d7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringTokenizeOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringTokenizeOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringTrimOperation.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringTrimOperation.java
index 8cbe44b..6366ad6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringTrimOperation.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/library/string/StringTrimOperation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/PivotMessages.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/PivotMessages.java
index 8ee9835..961e1fa 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/PivotMessages.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/PivotMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/PivotMessages.properties b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/PivotMessages.properties
index 6f1941b..730ab63 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/PivotMessages.properties
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/PivotMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/StatusCodes.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/StatusCodes.java
index a9d54e9..638a2f1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/StatusCodes.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/messages/StatusCodes.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/BasicOption.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/BasicOption.java
index 85055f5..3c9bb89 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/BasicOption.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/BasicOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/EnumeratedOption.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/EnumeratedOption.java
index a8be05f..7a88571 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/EnumeratedOption.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/EnumeratedOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/EvaluationOptions.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/EvaluationOptions.java
index 1704571..1b008f2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/EvaluationOptions.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/EvaluationOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/OCLinEcoreOptions.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/OCLinEcoreOptions.java
index 552afa4..bf80953 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/OCLinEcoreOptions.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/OCLinEcoreOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/OCLinEcorePreferenceInitializer.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/OCLinEcorePreferenceInitializer.java
index 9e9d2bf..9875429 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/OCLinEcorePreferenceInitializer.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/OCLinEcorePreferenceInitializer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ParsingOptions.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ParsingOptions.java
index d85acd5..118dac5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ParsingOptions.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ParsingOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/PivotConsoleOptions.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/PivotConsoleOptions.java
index 554b865..6271730 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/PivotConsoleOptions.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/PivotConsoleOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/PivotValidationOptions.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/PivotValidationOptions.java
index 8089820..5c5e85a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/PivotValidationOptions.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/PivotValidationOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ProblemHandler.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ProblemHandler.java
index ccff84b..058d68b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ProblemHandler.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ProblemHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ProblemOption.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ProblemOption.java
index 6576cfb..fe376ed 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ProblemOption.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/options/ProblemOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/ASResource.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/ASResource.java
index 626beff..2e4d518 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/ASResource.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/ASResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/BasicProjectManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/BasicProjectManager.java
index 7f5d199..8c4dcb9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/BasicProjectManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/BasicProjectManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/CSResource.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/CSResource.java
index 63b8bc1..83643e5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/CSResource.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/CSResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/ProjectManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/ProjectManager.java
index 6fe8d1b..ebb5e98 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/ProjectManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/resource/ProjectManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/AbstractFragment.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/AbstractFragment.java
index e9e660e..52f3d3a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/AbstractFragment.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/AbstractFragment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/AbstractInheritance.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/AbstractInheritance.java
index d9f7778..667eabe 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/AbstractInheritance.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/AbstractInheritance.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/ParameterTypesImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/ParameterTypesImpl.java
index 60766a5..14db95a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/ParameterTypesImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/ParameterTypesImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/TemplateParametersImpl.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/TemplateParametersImpl.java
index 6e3dc7f..33ca704 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/TemplateParametersImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/types/TemplateParametersImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AS2MonikerVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AS2MonikerVisitor.java
index b4a3611..d01df05 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AS2MonikerVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AS2MonikerVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AS2XMIidVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AS2XMIidVisitor.java
index 6fb54f8..08d8fdf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AS2XMIidVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AS2XMIidVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverLocateVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverLocateVisitor.java
index 293d826..c9f954f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverLocateVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverLocateVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverNormalizeVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverNormalizeVisitor.java
index ea3bc5b..dd78a5f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverNormalizeVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverNormalizeVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverResolveVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverResolveVisitor.java
index 49b13a4..6b98372 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverResolveVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ASSaverResolveVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AbstractEnvironmentFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AbstractEnvironmentFactory.java
index 3cf91a2..404aad6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AbstractEnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/AbstractEnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Adaptable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Adaptable.java
index 282b3f0..1bc67b7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Adaptable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Adaptable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ArrayIterable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ArrayIterable.java
index 97c4452..9b7b39a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ArrayIterable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ArrayIterable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ClassUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ClassUtil.java
index 23a15f9..7be7fc3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ClassUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ClassUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Customizable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Customizable.java
index 9b780e0..729b1a4 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Customizable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Customizable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/EnvironmentFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/EnvironmentFactory.java
index 871ec17..0762c62 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/EnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/EnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/FeatureFilter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/FeatureFilter.java
index 9abfa0b..e358cd0 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/FeatureFilter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/FeatureFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/IndexableIterable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/IndexableIterable.java
index accd1c8..e268bff 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/IndexableIterable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/IndexableIterable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/LabelUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/LabelUtil.java
index f4b6722..a7f9136 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/LabelUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/LabelUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Labelable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Labelable.java
index ad9520b..7123f7a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Labelable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Labelable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/MetamodelManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/MetamodelManager.java
index f0d2644..332539c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/MetamodelManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/MetamodelManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *	E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/MorePivotable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/MorePivotable.java
index d2c2c94..d38f1ce 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/MorePivotable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/MorePivotable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/NameUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/NameUtil.java
index b02a383..ba8070c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/NameUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/NameUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Nameable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Nameable.java
index 4308225..34710b3 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Nameable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Nameable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/OCL.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/OCL.java
index 0dd86f7..ea3008b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/OCL.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/OCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/OCLHelper.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/OCLHelper.java
index 251e0a8..9d0cc4c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/OCLHelper.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/OCLHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ObjectUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ObjectUtil.java
index f37212b..4fede03 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ObjectUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ObjectUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Option.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Option.java
index 8b00f1d..13bf92f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Option.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Option.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ParserContext.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ParserContext.java
index 40ac8cb..a0e81da 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ParserContext.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ParserContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ParserException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ParserException.java
index 3ae84db..5b431cc 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ParserException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ParserException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotAS2MonikerVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotAS2MonikerVisitor.java
index 9de844f..7374d64 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotAS2MonikerVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotAS2MonikerVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotAS2XMIidVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotAS2XMIidVisitor.java
index 8770e9f..5c596cd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotAS2XMIidVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverLocateVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverLocateVisitor.java
index eddb094..d4e1e0b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverLocateVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverLocateVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverNormalizeVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverNormalizeVisitor.java
index b765914..74116b8 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverNormalizeVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverNormalizeVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverResolveVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverResolveVisitor.java
index 20f9ec6..ce1519d 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverResolveVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotASSaverResolveVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations, University of York 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (University of York)
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotConstants.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotConstants.java
index 35c6dd1..01badcd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotConstants.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotHelper.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotHelper.java
index 61a5951..ddc5f29 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotHelper.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotObject.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotObject.java
index 330b1a9..1938e59 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotObject.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotObject.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotStandaloneSetup.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotStandaloneSetup.java
index ce0579a..a392a3b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotStandaloneSetup.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotTemplateParameterSubstitutionVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotTemplateParameterSubstitutionVisitor.java
index de43a5b..3d1be5b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotTemplateParameterSubstitutionVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotTemplateParameterSubstitutionVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java
index 3271cca..132b7d9 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/PivotUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Pivotable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Pivotable.java
index ef83456..bab54f1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Pivotable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Pivotable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Query.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Query.java
index 440cdb4..3710a9c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Query.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/Query.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SemanticException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SemanticException.java
index f77f361..1d3ec0b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SemanticException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SemanticException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SingletonIterator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SingletonIterator.java
index 47b63f5..85fc7ce 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SingletonIterator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SingletonIterator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/StringUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/StringUtil.java
index 5dffcc8..2d3cd22 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/StringUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/StringUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SyntaxException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SyntaxException.java
index 8b83ad3..0da8b06 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SyntaxException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/SyntaxException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ToStringVisitor.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ToStringVisitor.java
index 092fce0..56b1076 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ToStringVisitor.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ToStringVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TracingAdapter.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TracingAdapter.java
index 22741f0..7860448 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TracingAdapter.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TracingAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TracingOption.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TracingOption.java
index 078ba63..f2020b5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TracingOption.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TracingOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TreeIterable.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TreeIterable.java
index 1b6fef9..c42baa2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TreeIterable.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TreeIterable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TypeUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TypeUtil.java
index 116aeeb..5deccda 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TypeUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/TypeUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/URIUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/URIUtil.java
index 14f7ac7..61b99fd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/URIUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/URIUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ValueUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ValueUtil.java
index f1a97c3..4491d19 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ValueUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/ValueUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/XMIUtil.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/XMIUtil.java
index f2490bd..4b2ac29 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/XMIUtil.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/utilities/XMIUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/validation/ComposedEValidator.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/validation/ComposedEValidator.java
index 26008c5..cc04b1b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/validation/ComposedEValidator.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/validation/ComposedEValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/validation/ValidationWarning.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/validation/ValidationWarning.java
index 85bb7c3..6804421 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/validation/ValidationWarning.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/validation/ValidationWarning.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Bag.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Bag.java
index 622e8df..c557fad 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Bag.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Bag.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/BagValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/BagValue.java
index 19702f0..001d5cb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/BagValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/BagValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/CollectionTypeParameters.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/CollectionTypeParameters.java
index 58039fb..db52c0f 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/CollectionTypeParameters.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/CollectionTypeParameters.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/CollectionValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/CollectionValue.java
index fbb2e60..3a5d75a 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/CollectionValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/CollectionValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ComparableValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ComparableValue.java
index badee62..edb90cf 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ComparableValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ComparableValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/IntegerRange.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/IntegerRange.java
index 9d6751a..0d72289 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/IntegerRange.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/IntegerRange.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/IntegerValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/IntegerValue.java
index eb19728..515501b 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/IntegerValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/IntegerValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/InvalidValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/InvalidValue.java
index aba0427..7c243f2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/InvalidValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/InvalidValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/InvalidValueException.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/InvalidValueException.java
index 467d7f5..44c79e6 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/InvalidValueException.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/InvalidValueException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapEntry.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapEntry.java
index 97f2773..9890eee 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapEntry.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapEntry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapTypeParameters.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapTypeParameters.java
index 3c3b978..a875c84 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapTypeParameters.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapTypeParameters.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapValue.java
index f5e8502..ce9c057 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/MapValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/NullValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/NullValue.java
index c9b4086..f0749d7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/NullValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/NullValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/NumberValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/NumberValue.java
index 371aac8..1f7d4e7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/NumberValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/NumberValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OCLValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OCLValue.java
index 8e1efcd..d76b8fb 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OCLValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OCLValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ObjectValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ObjectValue.java
index 2e30a8e..25389ad 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ObjectValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ObjectValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedCollectionValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedCollectionValue.java
index e25537f..c3543f5 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedCollectionValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedCollectionValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedSet.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedSet.java
index 9715c8b..67d0cba 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedSet.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedSetValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedSetValue.java
index 2c36606..87b0eed 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedSetValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/OrderedSetValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/RealValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/RealValue.java
index 9d2a42a..2262da2 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/RealValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/RealValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/SequenceValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/SequenceValue.java
index 7079772..7808e31 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/SequenceValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/SequenceValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/SetValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/SetValue.java
index 3e321bb..1f8b3b7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/SetValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/SetValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/TemplateParameterSubstitutions.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/TemplateParameterSubstitutions.java
index cdf2122..884c612 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/TemplateParameterSubstitutions.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/TemplateParameterSubstitutions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/TupleValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/TupleValue.java
index 57b366d..466a811 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/TupleValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/TupleValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UniqueCollectionValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UniqueCollectionValue.java
index 5a56656..ffc6b3c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UniqueCollectionValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UniqueCollectionValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Unlimited.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Unlimited.java
index 7af208a..b3c83ef 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Unlimited.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Unlimited.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UnlimitedNaturalValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UnlimitedNaturalValue.java
index 6d30a04..5ddb6ff 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UnlimitedNaturalValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UnlimitedNaturalValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UnlimitedValue.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UnlimitedValue.java
index 5e0050c..346085c 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UnlimitedValue.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/UnlimitedValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Value.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Value.java
index 34e1045..55739b7 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Value.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/Value.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ValuesFactory.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ValuesFactory.java
index f7943a8..3b93606 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ValuesFactory.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ValuesFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ValuesPackage.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ValuesPackage.java
index 7301711..fda8d37 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ValuesPackage.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/values/ValuesPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ui/about.html b/plugins/org.eclipse.ocl.ui/about.html
index 04b5c76..421427c 100644
--- a/plugins/org.eclipse.ocl.ui/about.html
+++ b/plugins/org.eclipse.ocl.ui/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.ui/about.properties b/plugins/org.eclipse.ocl.ui/about.properties
index a561473..8cfd90d 100644
--- a/plugins/org.eclipse.ocl.ui/about.properties
+++ b/plugins/org.eclipse.ocl.ui/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ui/build.properties b/plugins/org.eclipse.ocl.ui/build.properties
index 08f9bba..b8911c8 100644
--- a/plugins/org.eclipse.ocl.ui/build.properties
+++ b/plugins/org.eclipse.ocl.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ui/plugin.properties b/plugins/org.eclipse.ocl.ui/plugin.properties
index bde261c..086af91 100644
--- a/plugins/org.eclipse.ocl.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/messages/EcoreAndUMLUIMessages.java b/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/messages/EcoreAndUMLUIMessages.java
index 6649e93..3efbfac 100644
--- a/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/messages/EcoreAndUMLUIMessages.java
+++ b/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/messages/EcoreAndUMLUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/messages/EcoreAndUMLUIMessages.properties b/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/messages/EcoreAndUMLUIMessages.properties
index 72ae9d5..21167dc 100644
--- a/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/messages/EcoreAndUMLUIMessages.properties
+++ b/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/messages/EcoreAndUMLUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/preferences/EcoreAndUmlProjectPreferencePage.java b/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/preferences/EcoreAndUmlProjectPreferencePage.java
index c94648a..ec42cc6 100644
--- a/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/preferences/EcoreAndUmlProjectPreferencePage.java
+++ b/plugins/org.eclipse.ocl.ui/src/org/eclipse/ocl/ui/internal/preferences/EcoreAndUmlProjectPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/about.html b/plugins/org.eclipse.ocl.uml.edit/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.uml.edit/about.html
+++ b/plugins/org.eclipse.ocl.uml.edit/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.uml.edit/build.properties b/plugins/org.eclipse.ocl.uml.edit/build.properties
index 4afa3b7..75fd630 100644
--- a/plugins/org.eclipse.ocl.uml.edit/build.properties
+++ b/plugins/org.eclipse.ocl.uml.edit/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/plugin.properties b/plugins/org.eclipse.ocl.uml.edit/plugin.properties
index 21847c3..aa4b028 100644
--- a/plugins/org.eclipse.ocl.uml.edit/plugin.properties
+++ b/plugins/org.eclipse.ocl.uml.edit/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/plugin.xml b/plugins/org.eclipse.ocl.uml.edit/plugin.xml
index 5f9599b..12ca325 100644
--- a/plugins/org.eclipse.ocl.uml.edit/plugin.xml
+++ b/plugins/org.eclipse.ocl.uml.edit/plugin.xml
@@ -4,9 +4,9 @@
 <!--
  Copyright (c) 2009 Willink Transformations 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 v2.0
  which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
 
  Contributors:
    E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/edit/OCLUMLEditPlugin.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/edit/OCLUMLEditPlugin.java
index e649427..e35703e 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/edit/OCLUMLEditPlugin.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/edit/OCLUMLEditPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/AnyTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/AnyTypeItemProvider.java
index d78fe28..3c57ad1 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/AnyTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/AnyTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/AssociationClassCallExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/AssociationClassCallExpItemProvider.java
index 4ca0c5d..5a81da0 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/AssociationClassCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/AssociationClassCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/BagTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/BagTypeItemProvider.java
index 3728911..2d3b64d 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/BagTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/BagTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/BooleanLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/BooleanLiteralExpItemProvider.java
index 08aedb2..6159b8c 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/BooleanLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/BooleanLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CallExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CallExpItemProvider.java
index ac36e24..366afff 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionItemItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionItemItemProvider.java
index 94f22b8..433efe6 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionItemItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionItemItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionLiteralExpItemProvider.java
index 53e737e..9583082 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionLiteralPartItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionLiteralPartItemProvider.java
index 9d37aae..49cce62 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionLiteralPartItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionLiteralPartItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionRangeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionRangeItemProvider.java
index 7efc10a..8454244 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionRangeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionRangeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionTypeItemProvider.java
index 25ab705..383e59f 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/CollectionTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/ElementTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/ElementTypeItemProvider.java
index c57b68b..47ce5e5 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/ElementTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/ElementTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/EnumLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/EnumLiteralExpItemProvider.java
index 8ed51d6..86283fb 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/EnumLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/EnumLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/ExpressionInOCLItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/ExpressionInOCLItemProvider.java
index 5ce8c5c..e6c7c3d 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/ExpressionInOCLItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/ExpressionInOCLItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/FeatureCallExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/FeatureCallExpItemProvider.java
index 776c0c1..959f0be 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/FeatureCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/FeatureCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IfExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IfExpItemProvider.java
index 8eda6b3..4e65615 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IfExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IfExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IntegerLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IntegerLiteralExpItemProvider.java
index 2eb323d..daaba19 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IntegerLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IntegerLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/InvalidLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/InvalidLiteralExpItemProvider.java
index 6002da9..86accd5 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/InvalidLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/InvalidLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/InvalidTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/InvalidTypeItemProvider.java
index b433e04..1dfce9d 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/InvalidTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/InvalidTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IterateExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IterateExpItemProvider.java
index 1158d96..4a08580 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IterateExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IterateExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IteratorExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IteratorExpItemProvider.java
index 17d17a0..6ffa547 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IteratorExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/IteratorExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LetExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LetExpItemProvider.java
index 617913b..3fda856 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LetExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LetExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LiteralExpItemProvider.java
index 2e85964..4a2a5bf 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LoopExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LoopExpItemProvider.java
index 7a09cb7..a35f0c2 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LoopExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/LoopExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/MessageExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/MessageExpItemProvider.java
index ad36032..3059ac5 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/MessageExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/MessageExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/MessageTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/MessageTypeItemProvider.java
index 084c628..81d8ac4 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/MessageTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/MessageTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NavigationCallExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NavigationCallExpItemProvider.java
index fee216e..2a1fd21 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NavigationCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NavigationCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NullLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NullLiteralExpItemProvider.java
index 7ec295a..a72a78c 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NullLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NullLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NumericLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NumericLiteralExpItemProvider.java
index b0a353b..04ea206 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NumericLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/NumericLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OCLExpressionItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OCLExpressionItemProvider.java
index 6d450fe..5262592 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OCLExpressionItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OCLExpressionItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OperationCallExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OperationCallExpItemProvider.java
index 14389cb..d26bf9d 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OperationCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OperationCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OrderedSetTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OrderedSetTypeItemProvider.java
index d7d89dd..ffe1929 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OrderedSetTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/OrderedSetTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PrimitiveLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PrimitiveLiteralExpItemProvider.java
index 3e05614..4fb85dc 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PrimitiveLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PrimitiveLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PrimitiveTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PrimitiveTypeItemProvider.java
index 1099c4d..73dda45 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PrimitiveTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PrimitiveTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PropertyCallExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PropertyCallExpItemProvider.java
index 98a4214..ac4dea1 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PropertyCallExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/PropertyCallExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/RealLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/RealLiteralExpItemProvider.java
index 4710d31..a65253d 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/RealLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/RealLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/SequenceTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/SequenceTypeItemProvider.java
index 8da255a..0ad4bef 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/SequenceTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/SequenceTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/SetTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/SetTypeItemProvider.java
index a3c7e12..85a3dd1 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/SetTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/SetTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/StateExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/StateExpItemProvider.java
index eb5760e..9fd06c2 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/StateExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/StateExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/StringLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/StringLiteralExpItemProvider.java
index c0218e5..a6ca091 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/StringLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/StringLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TemplateParameterTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TemplateParameterTypeItemProvider.java
index f0b335a..3530a66 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TemplateParameterTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TemplateParameterTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleLiteralExpItemProvider.java
index 56897b0..9444ffd 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleLiteralPartItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleLiteralPartItemProvider.java
index 352e5bd..5fccaac 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleLiteralPartItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleLiteralPartItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleTypeItemProvider.java
index 44d37da..4942f72 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TupleTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TypeExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TypeExpItemProvider.java
index ddeb373..4fc239f 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TypeExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TypeExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TypeTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TypeTypeItemProvider.java
index 409c948..8d13d00 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TypeTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/TypeTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UMLItemProviderAdapterFactory.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UMLItemProviderAdapterFactory.java
index 2cb673d..45e0dd2 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UMLItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UMLItemProviderAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UnlimitedNaturalLiteralExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UnlimitedNaturalLiteralExpItemProvider.java
index d82fcd3..8c24c60 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UnlimitedNaturalLiteralExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UnlimitedNaturalLiteralExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UnspecifiedValueExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UnspecifiedValueExpItemProvider.java
index 4ed4099..79f26a9 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UnspecifiedValueExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/UnspecifiedValueExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VariableExpItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VariableExpItemProvider.java
index 847107d..3765ee2 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VariableExpItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VariableExpItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VariableItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VariableItemProvider.java
index 07666ab..90ac56a 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VariableItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VariableItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VoidTypeItemProvider.java b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VoidTypeItemProvider.java
index a13621d..86d10f9 100644
--- a/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VoidTypeItemProvider.java
+++ b/plugins/org.eclipse.ocl.uml.edit/src/org/eclipse/ocl/uml/provider/VoidTypeItemProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.ui/about.html b/plugins/org.eclipse.ocl.uml.ui/about.html
index 04b5c76..421427c 100644
--- a/plugins/org.eclipse.ocl.uml.ui/about.html
+++ b/plugins/org.eclipse.ocl.uml.ui/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.uml.ui/build.properties b/plugins/org.eclipse.ocl.uml.ui/build.properties
index 50f3ffc..8d95b0a 100644
--- a/plugins/org.eclipse.ocl.uml.ui/build.properties
+++ b/plugins/org.eclipse.ocl.uml.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.ui/plugin.properties b/plugins/org.eclipse.ocl.uml.ui/plugin.properties
index 326d094..3c46af9 100644
--- a/plugins/org.eclipse.ocl.uml.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.uml.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/messages/UMLUIMessages.java b/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/messages/UMLUIMessages.java
index b6a5182..5d31ef8 100644
--- a/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/messages/UMLUIMessages.java
+++ b/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/messages/UMLUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/messages/UMLUIMessages.properties b/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/messages/UMLUIMessages.properties
index 0bfe86e..ca2b20a 100644
--- a/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/messages/UMLUIMessages.properties
+++ b/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/messages/UMLUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/preferences/UMLProjectPreferencePage.java b/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/preferences/UMLProjectPreferencePage.java
index 44fe5fb..03e9652 100644
--- a/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/preferences/UMLProjectPreferencePage.java
+++ b/plugins/org.eclipse.ocl.uml.ui/src/org/eclipse/ocl/uml/ui/internal/preferences/UMLProjectPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/about.html b/plugins/org.eclipse.ocl.uml/about.html
index c0be2e9..e9d1dac 100644
--- a/plugins/org.eclipse.ocl.uml/about.html
+++ b/plugins/org.eclipse.ocl.uml/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.uml/about.properties b/plugins/org.eclipse.ocl.uml/about.properties
index 1050229..a9d58e7 100644
--- a/plugins/org.eclipse.ocl.uml/about.properties
+++ b/plugins/org.eclipse.ocl.uml/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/build.properties b/plugins/org.eclipse.ocl.uml/build.properties
index 3ca79b4..36937db 100644
--- a/plugins/org.eclipse.ocl.uml/build.properties
+++ b/plugins/org.eclipse.ocl.uml/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/model/OCLUML.properties b/plugins/org.eclipse.ocl.uml/model/OCLUML.properties
index 4804621..f916bc4 100644
--- a/plugins/org.eclipse.ocl.uml/model/OCLUML.properties
+++ b/plugins/org.eclipse.ocl.uml/model/OCLUML.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2007 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/plugin.properties b/plugins/org.eclipse.ocl.uml/plugin.properties
index cf03194..e0e1983 100644
--- a/plugins/org.eclipse.ocl.uml/plugin.properties
+++ b/plugins/org.eclipse.ocl.uml/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/plugin.xml b/plugins/org.eclipse.ocl.uml/plugin.xml
index 600bdf0..b31a455 100644
--- a/plugins/org.eclipse.ocl.uml/plugin.xml
+++ b/plugins/org.eclipse.ocl.uml/plugin.xml
@@ -4,9 +4,9 @@
 <!--
  Copyright (c) 2006, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
 
  Contributors:
    IBM - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/AnyType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/AnyType.java
index c4de604..a84b657 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/AnyType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/AnyType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/AssociationClassCallExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/AssociationClassCallExp.java
index 99aeb07..855a45b 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/AssociationClassCallExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/AssociationClassCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/BagType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/BagType.java
index 9036447..2f1e323 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/BagType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/BagType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/BooleanLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/BooleanLiteralExp.java
index b6a0e63..b3c0fe0 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/BooleanLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/BooleanLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CallExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CallExp.java
index 89be7ca..29c1684 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CallExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionItem.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionItem.java
index 35205bb..bc00cd8 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionItem.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionItem.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionLiteralExp.java
index c46d5af..2f40f46 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionLiteralPart.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionLiteralPart.java
index 2e2690a..9686d1f 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionLiteralPart.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionLiteralPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionRange.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionRange.java
index 2762950..b153681 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionRange.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionRange.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionType.java
index 68eaf60..eda85d7 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/CollectionType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/ElementType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/ElementType.java
index 7499ecc..a2ef11d 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/ElementType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/ElementType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/EnumLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/EnumLiteralExp.java
index 54777bb..f6b86fa 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/EnumLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/EnumLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/ExpressionInOCL.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/ExpressionInOCL.java
index 1748b61..b0bf294 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/ExpressionInOCL.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/ExpressionInOCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/FeatureCallExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/FeatureCallExp.java
index 716ee3c..fdb3a58 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/FeatureCallExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/FeatureCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IfExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IfExp.java
index 8a9000e..99ec3d5 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IfExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IfExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IntegerLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IntegerLiteralExp.java
index d9a0f8b..3d79428 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IntegerLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IntegerLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/InvalidLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/InvalidLiteralExp.java
index 93818c9..3af5d4b 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/InvalidLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/InvalidLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/InvalidType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/InvalidType.java
index db31ca0..b9847b8 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/InvalidType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/InvalidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IterateExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IterateExp.java
index 7481827..4c4384e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IterateExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IterateExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IteratorExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IteratorExp.java
index 46ebe3d..aa9bafa 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IteratorExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/IteratorExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LetExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LetExp.java
index 516ddd3..676e656 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LetExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LetExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LiteralExp.java
index 9d23785..a7243d5 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LoopExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LoopExp.java
index 5e76370..409cb5a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LoopExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/LoopExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/MessageExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/MessageExp.java
index f21ae6a..c2832ea 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/MessageExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/MessageExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/MessageType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/MessageType.java
index b9cdcab..c5001f8 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/MessageType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/MessageType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NavigationCallExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NavigationCallExp.java
index 2dcf943..4f3d4b1 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NavigationCallExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NavigationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NullLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NullLiteralExp.java
index 9607f8b..65b9c23 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NullLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NullLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NumericLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NumericLiteralExp.java
index ee54a88..5181569 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NumericLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/NumericLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCL.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCL.java
index 1333b14..6b622b6 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCL.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCLExpression.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCLExpression.java
index b90c4cb..bb16ba7 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCLExpression.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCLExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCLHelperImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCLHelperImpl.java
index ea13ac3..d29f5b5 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCLHelperImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OCLHelperImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2008 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OperationCallExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OperationCallExp.java
index 32d401f..d5530a9 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OperationCallExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OrderedSetType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OrderedSetType.java
index b3d5fe2..f88666e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OrderedSetType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/OrderedSetType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PrimitiveLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PrimitiveLiteralExp.java
index c363f12..0e128a4 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PrimitiveLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PrimitiveLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PrimitiveType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PrimitiveType.java
index f35dbb2..47938dd 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PrimitiveType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PrimitiveType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PropertyCallExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PropertyCallExp.java
index 983f556..3dbfbf6 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PropertyCallExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/PropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/QueryImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/QueryImpl.java
index be71392..8ac182b 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/QueryImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/QueryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Borland Software Corporation, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/RealLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/RealLiteralExp.java
index 04473d1..45f4fa7 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/RealLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/RealLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/SequenceType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/SequenceType.java
index 855b618..4491cf0 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/SequenceType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/SequenceType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/SetType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/SetType.java
index b85df32..8f0eb17 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/SetType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/SetType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/StateExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/StateExp.java
index 6855c4c..30f35c6 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/StateExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/StateExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/StringLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/StringLiteralExp.java
index 8dbff8a..c07a0f6 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/StringLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/StringLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TemplateParameterType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TemplateParameterType.java
index e917cdc..751a1ce 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TemplateParameterType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TemplateParameterType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleLiteralExp.java
index 40b9c0a..f65234d 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleLiteralPart.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleLiteralPart.java
index faf7b0b..3b00473 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleLiteralPart.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleLiteralPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleType.java
index f0e01a0..8456b0a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TupleType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeExp.java
index df48cc9..cf5c38a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeResolverImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeResolverImpl.java
index ac33cf9..124a416 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeResolverImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeResolverImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeType.java
index e528e71..872d55a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/TypeType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEnvironment.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEnvironment.java
index 32ec80b..a680f53 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEnvironment.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEnvironmentFactory.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEnvironmentFactory.java
index 7da551c..4b29b1e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java
index 2be62e7..e2f019e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLFactory.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLFactory.java
index b65efc9..27c8d44 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLFactory.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLFormattingHelper.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLFormattingHelper.java
index eff396a..7d5a804 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLFormattingHelper.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLFormattingHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLOCLStandardLibrary.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLOCLStandardLibrary.java
index 1a76e4b..e21c5d9 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLOCLStandardLibrary.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLOCLStandardLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2010 Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     A. Sanchez-Barbudo Herrera - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLPackage.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLPackage.java
index abeb641..141f2e9 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLPackage.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UMLPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UnlimitedNaturalLiteralExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UnlimitedNaturalLiteralExp.java
index 403d2d6..ab6338e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UnlimitedNaturalLiteralExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UnlimitedNaturalLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UnspecifiedValueExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UnspecifiedValueExp.java
index 41899a7..5e754dd 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UnspecifiedValueExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/UnspecifiedValueExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/Variable.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/Variable.java
index 2f6c3a4..27c3dac 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/Variable.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/Variable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/VariableExp.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/VariableExp.java
index 53385d3..a036c83 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/VariableExp.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/VariableExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/VoidType.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/VoidType.java
index 678d8f2..4f99a32 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/VoidType.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/VoidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/AnyTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/AnyTypeImpl.java
index cb0a6e4..1cec7d8 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/AnyTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/AnyTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/AssociationClassCallExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/AssociationClassCallExpImpl.java
index db1762f..117e78a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/AssociationClassCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/AssociationClassCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/BagTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/BagTypeImpl.java
index f3daa10..20c4f10 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/BagTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/BagTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/BooleanLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/BooleanLiteralExpImpl.java
index 9c1219d..4fd15be 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/BooleanLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/BooleanLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CallExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CallExpImpl.java
index 982a653..759fb04 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CallExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionItemImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionItemImpl.java
index b60aad6..2964e2a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionItemImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionItemImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionLiteralExpImpl.java
index 0cf1558..82c23da 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionLiteralPartImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionLiteralPartImpl.java
index 4818f19..1d98c85 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionRangeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionRangeImpl.java
index cf664db..e42ebb3 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionRangeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionRangeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionTypeImpl.java
index 35a9e4e..a82beff 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/CollectionTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/ElementTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/ElementTypeImpl.java
index 97921fc..f072e3e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/ElementTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/ElementTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/EnumLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/EnumLiteralExpImpl.java
index c8db7be..233b211 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/EnumLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/EnumLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/ExpressionInOCLImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/ExpressionInOCLImpl.java
index 637cc6e..af75bd4 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/ExpressionInOCLImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/ExpressionInOCLImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/FeatureCallExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/FeatureCallExpImpl.java
index 23f67fb..7a9f06e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/FeatureCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/FeatureCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IfExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IfExpImpl.java
index 54c5f7f..993f041 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IfExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IfExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IntegerLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IntegerLiteralExpImpl.java
index 4cfa051..22eb070 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IntegerLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IntegerLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/InvalidLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/InvalidLiteralExpImpl.java
index c21646a..9779b1d 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/InvalidLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/InvalidLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/InvalidTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/InvalidTypeImpl.java
index a980686..4668b05 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/InvalidTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/InvalidTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IterateExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IterateExpImpl.java
index 939a3a1..0aa2e65 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IterateExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IterateExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IteratorExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IteratorExpImpl.java
index 29812fa..3dc835b 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IteratorExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/IteratorExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LetExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LetExpImpl.java
index d3c00f0..1857382 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LetExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LetExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LiteralExpImpl.java
index 5f43bec..28f6677 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LoopExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LoopExpImpl.java
index ec553f5..194450c 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LoopExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/LoopExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/MessageExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/MessageExpImpl.java
index 8c261a0..9419c1d 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/MessageExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/MessageExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/MessageTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/MessageTypeImpl.java
index f0c6da3..a354adb 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/MessageTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/MessageTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NavigationCallExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NavigationCallExpImpl.java
index 6dc4149..87cb0fb 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NavigationCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NavigationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NullLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NullLiteralExpImpl.java
index 891bc70..cffeca8 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NullLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NullLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NumericLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NumericLiteralExpImpl.java
index 87f29e6..0b1f274 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NumericLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/NumericLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OCLExpressionImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OCLExpressionImpl.java
index c5ad7b3..a8df411 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OCLExpressionImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OCLExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OperationCallExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OperationCallExpImpl.java
index c163289..0c980b5 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OperationCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OrderedSetTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OrderedSetTypeImpl.java
index 6249798..db66f08 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OrderedSetTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/OrderedSetTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PrimitiveLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PrimitiveLiteralExpImpl.java
index 28c3b2e..1978d5c 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PrimitiveLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PrimitiveLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PrimitiveTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PrimitiveTypeImpl.java
index 6969771..a44f18c 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PrimitiveTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PrimitiveTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PropertyCallExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PropertyCallExpImpl.java
index 36821ba..d3d0356 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PropertyCallExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/PropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/RealLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/RealLiteralExpImpl.java
index e5cc9ab..23bbb71 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/RealLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/RealLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/SequenceTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/SequenceTypeImpl.java
index d1def93..73767d3 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/SequenceTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/SequenceTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/SetTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/SetTypeImpl.java
index 74b4592..9f2898f 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/SetTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/SetTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/StateExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/StateExpImpl.java
index 604cfbe..409976b 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/StateExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/StateExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/StringLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/StringLiteralExpImpl.java
index 6badc83..ceaeb11 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/StringLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/StringLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TemplateParameterTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TemplateParameterTypeImpl.java
index 7b75966..a850641 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TemplateParameterTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TemplateParameterTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleLiteralExpImpl.java
index f515094..cbb2d9a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleLiteralPartImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleLiteralPartImpl.java
index 5da8043..e489586 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleTypeImpl.java
index 3111072..a4dfb7d 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TupleTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TypeExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TypeExpImpl.java
index 6c49580..ca12540 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TypeExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TypeExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TypeTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TypeTypeImpl.java
index 7a16c12..4a887bf 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TypeTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/TypeTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UMLFactoryImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UMLFactoryImpl.java
index 419eec8..d4c5a4a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UMLFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UMLFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UMLPackageImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UMLPackageImpl.java
index bd527b2..866692a 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UMLPackageImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UMLPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UnlimitedNaturalLiteralExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UnlimitedNaturalLiteralExpImpl.java
index 203efad..803d5b0 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UnlimitedNaturalLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UnlimitedNaturalLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UnspecifiedValueExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UnspecifiedValueExpImpl.java
index 3a944cf..3e428dd 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UnspecifiedValueExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/UnspecifiedValueExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VariableExpImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VariableExpImpl.java
index 337d0de..ebe8b85 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VariableExpImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VariableExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VariableImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VariableImpl.java
index 77327ad..bcf5291 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VariableImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VoidTypeImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VoidTypeImpl.java
index b068140..86dae36 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VoidTypeImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/VoidTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/package.html b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/package.html
index 208b0b7..e52039e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/package.html
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/impl/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLDebugOptions.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLDebugOptions.java
index b9b0f3e..a04cce9 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLDebugOptions.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLDebugOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLFactoryImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLFactoryImpl.java
index 37a2453..a8b203d 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLStandardLibraryImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLStandardLibraryImpl.java
index 82d4318..e0011ea 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLStandardLibraryImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLStandardLibraryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLStatusCodes.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLStatusCodes.java
index 0fa614f..2995ec3 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLStatusCodes.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLStatusCodes.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLUMLPlugin.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLUMLPlugin.java
index 9ffde3a..d65193c 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLUMLPlugin.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/OCLUMLPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLForeignMethods.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLForeignMethods.java
index 47a5891..3c94330 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLForeignMethods.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLForeignMethods.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLPreferenceInitializer.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLPreferenceInitializer.java
index 3709119..41250b1 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLPreferenceInitializer.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLPreferenceInitializer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLReflectionImpl.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLReflectionImpl.java
index 8124e83..bacfae0 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLReflectionImpl.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/UMLReflectionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/AnyTypeOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/AnyTypeOperations.java
index 32a1cf7..1aebd7f 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/AnyTypeOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/AnyTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Zeligsoft - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/CollectionLiteralPartOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/CollectionLiteralPartOperations.java
index 45c1c98..c700014 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/CollectionLiteralPartOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/CollectionLiteralPartOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/CollectionTypeOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/CollectionTypeOperations.java
index 54dbdbc..c673201 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/CollectionTypeOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/CollectionTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/ExpressionInOCLOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/ExpressionInOCLOperations.java
index 4191ea1..956b770 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/ExpressionInOCLOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/ExpressionInOCLOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/InvalidTypeOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/InvalidTypeOperations.java
index e89a5d9..b1a9d59 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/InvalidTypeOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/InvalidTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/MessageTypeOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/MessageTypeOperations.java
index 96d58b1..5d7508e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/MessageTypeOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/MessageTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/OCLExpressionOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/OCLExpressionOperations.java
index 61eaee8..4fddb24 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/OCLExpressionOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/OCLExpressionOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2018 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/PrimitiveTypeOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/PrimitiveTypeOperations.java
index db00fd9..cc7c22d 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/PrimitiveTypeOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/PrimitiveTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TupleLiteralPartOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TupleLiteralPartOperations.java
index 3e5631a..4a3a695 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TupleLiteralPartOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TupleLiteralPartOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TupleTypeOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TupleTypeOperations.java
index d82e8c6..3735b06 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TupleTypeOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TupleTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TypeTypeOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TypeTypeOperations.java
index 5c89327..bbb2e49 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TypeTypeOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/TypeTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/VariableOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/VariableOperations.java
index 3086fa9..e0f5563 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/VariableOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/VariableOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/VoidTypeOperations.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/VoidTypeOperations.java
index fd73a4b..1e36e54 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/VoidTypeOperations.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/internal/operations/VoidTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ *  http://www.eclipse.org/legal/epl-v20.html
  *  
  *  Contributors:
  *    Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/EvaluationMode.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/EvaluationMode.java
index 2c9926f..4108d91 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/EvaluationMode.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/EvaluationMode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/UMLEvaluationOptions.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/UMLEvaluationOptions.java
index 43bb1bc..70c30a4 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/UMLEvaluationOptions.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/UMLEvaluationOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/UMLParsingOptions.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/UMLParsingOptions.java
index 2634428..a6250e6 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/UMLParsingOptions.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/options/UMLParsingOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/package.html b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/package.html
index c2dc723..8de6e63 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/package.html
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/OCLUMLUtil.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/OCLUMLUtil.java
index 350840d..0b2921e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/OCLUMLUtil.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/OCLUMLUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLAdapterFactory.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLAdapterFactory.java
index 1598c9c..55344c0 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2011 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLDerivedUnionAdapter.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLDerivedUnionAdapter.java
index 24570b8..32d031e 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLDerivedUnionAdapter.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLDerivedUnionAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLSwitch.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLSwitch.java
index bde7795..f51fd42 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLSwitch.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLValidator.java b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLValidator.java
index 74c39fb..7347e2f 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLValidator.java
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/UMLValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/package.html b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/package.html
index 045c3b9..840eb37 100644
--- a/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/package.html
+++ b/plugins/org.eclipse.ocl.uml/src/org/eclipse/ocl/uml/util/package.html
@@ -8,9 +8,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/about.html b/plugins/org.eclipse.ocl.xtext.base.ui/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/about.html
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/build.properties b/plugins/org.eclipse.ocl.xtext.base.ui/build.properties
index a2c5a12..9ab0b4d 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/plugin.properties b/plugins/org.eclipse.ocl.xtext.base.ui/plugin.properties
index 29cf270..96b0ec9 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/AbstractBaseUiModule.java b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/AbstractBaseUiModule.java
index 5cf6b35..c66ceca 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/AbstractBaseUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/AbstractBaseUiModule.java
@@ -2,9 +2,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/BaseExecutableExtensionFactory.java b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/BaseExecutableExtensionFactory.java
index 8e7b62a..e5a5e0f 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/BaseExecutableExtensionFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/BaseExecutableExtensionFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/AbstractBaseProposalProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/AbstractBaseProposalProvider.java
index 6a163b6..e022c37 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/AbstractBaseProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/AbstractBaseProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/BaseParser.java b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/BaseParser.java
index 1a0c053..b469116 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/BaseParser.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/BaseParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBase.g b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBase.g
index 14b2dd8..67f9635 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBase.g
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBase.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBaseLexer.java b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBaseLexer.java
index 9b7b7fc..e7844a4 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBaseLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBaseLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBaseParser.java b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBaseParser.java
index 8251952..12fb789 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBaseParser.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/contentassist/antlr/internal/InternalBaseParser.java
@@ -23,9 +23,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/internal/BaseActivator.java b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/internal/BaseActivator.java
index 9e34f80..7504e6f 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/internal/BaseActivator.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src-gen/org/eclipse/ocl/xtext/base/ui/internal/BaseActivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseEditor.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseEditor.java
index c484dc1..40f8777 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseEditor.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseEditor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUIActivator.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUIActivator.java
index 5b89d76..0d5eddf 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUIActivator.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUIActivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUiModule.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUiModule.java
index 9e07d66..f6ced86 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUiModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUiPluginHelper.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUiPluginHelper.java
index 9b35187..4d41adc 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUiPluginHelper.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/BaseUiPluginHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/OCLProjectHelper.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/OCLProjectHelper.java
index d58233b..cab1274 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/OCLProjectHelper.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/OCLProjectHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.ui.XtextProjectHelper
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/autoedit/BaseAutoEditStrategyProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/autoedit/BaseAutoEditStrategyProvider.java
index 473b2b6..bea8896 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/autoedit/BaseAutoEditStrategyProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/autoedit/BaseAutoEditStrategyProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/AbstractBuildSelector.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/AbstractBuildSelector.java
index 8a9e454..be9fcfc 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/AbstractBuildSelector.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/AbstractBuildSelector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017,2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.builder.nature.XtextNature
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/AbstractValidatingBuilder.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/AbstractValidatingBuilder.java
index 3bf45c4..d66d87a 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/AbstractValidatingBuilder.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/AbstractValidatingBuilder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017,2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.builder.nature.XtextNature
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/MultiValidationJob.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/MultiValidationJob.java
index b36f11d..ec31056 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/MultiValidationJob.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/MultiValidationJob.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.builder.nature.XtextNature
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/ValidationEntry.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/ValidationEntry.java
index 083b357..2c82335 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/ValidationEntry.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/builder/ValidationEntry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.builder.nature.XtextNature
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/SaveASHandler.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/SaveASHandler.java
index b6e8d10..9e8b637 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/SaveASHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/SaveASHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/SaveCSHandler.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/SaveCSHandler.java
index 7cd974c..c63aa7f 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/SaveCSHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/SaveCSHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ToggleNatureCommand.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ToggleNatureCommand.java
index ed57e29..d9bbff8 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ToggleNatureCommand.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ToggleNatureCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.builder.nature.ToggleXtextNatureCommand
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ToggleOCLNatureCommand.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ToggleOCLNatureCommand.java
index 9cc26b6..eaf37f6 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ToggleOCLNatureCommand.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ToggleOCLNatureCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation based on org.eclipse.xtext.builder.nature.ToggleXtextNatureCommand
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ValidateCommand.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ValidateCommand.java
index 6845a2e..21f670d 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ValidateCommand.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ValidateCommand.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ValidateHandler.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ValidateHandler.java
index 3131981..2409958 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ValidateHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/commands/ValidateHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/contentassist/BaseProposalProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/contentassist/BaseProposalProvider.java
index c521a95..f38c559 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/contentassist/BaseProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/contentassist/BaseProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/labeling/BaseDescriptionLabelProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/labeling/BaseDescriptionLabelProvider.java
index a616c94..d0298ac 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/labeling/BaseDescriptionLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/labeling/BaseDescriptionLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/labeling/BaseLabelProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/labeling/BaseLabelProvider.java
index 2a888ab..a1a7183 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/labeling/BaseLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/labeling/BaseLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/messages/BaseUIMessages.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/messages/BaseUIMessages.java
index c7b4bad..8f98a87 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/messages/BaseUIMessages.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/messages/BaseUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/messages/BaseUIMessages.properties b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/messages/BaseUIMessages.properties
index 9f5f97e..3ee8bfe 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/messages/BaseUIMessages.properties
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/messages/BaseUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseCSorASDocumentProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseCSorASDocumentProvider.java
index 26230c0..67c437e 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseCSorASDocumentProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseCSorASDocumentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocument.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocument.java
index db88835..6a79bae 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocument.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocumentProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocumentProvider.java
index 54d7f6f..310421a 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocumentProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocumentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocumentationProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocumentationProvider.java
index f3e592d..7236afd 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocumentationProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseDocumentationProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseEditorCallback.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseEditorCallback.java
index c923bb2..5bb7a5b 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseEditorCallback.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseEditorCallback.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
  * http:www.eclipse.org/legal/epl-v10.html
  *
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseTerminalsTokenTypeToPartitionMapper.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseTerminalsTokenTypeToPartitionMapper.java
index eb7bf61..b214b5d 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseTerminalsTokenTypeToPartitionMapper.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseTerminalsTokenTypeToPartitionMapper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseURIEditorOpener.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseURIEditorOpener.java
index 48994f9..351cbb1 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseURIEditorOpener.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/BaseURIEditorOpener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/ConsoleContext.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/ConsoleContext.java
index 9590b72..c6e1694 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/ConsoleContext.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/ConsoleContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/DeferredDocumentProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/DeferredDocumentProvider.java
index 62eeeb8..3ec598f 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/DeferredDocumentProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/model/DeferredDocumentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineNode.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineNode.java
index 10bbd40..faecf55 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineNode.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineNodeElementOpener.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineNodeElementOpener.java
index 811ffd8..41efc59 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineNodeElementOpener.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineNodeElementOpener.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineTreeProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineTreeProvider.java
index 7736cf6..768ec5a 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineTreeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineTreeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineWithEditorLinker.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineWithEditorLinker.java
index 0786fd5..3d025f5 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineWithEditorLinker.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/outline/BaseOutlineWithEditorLinker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/quickfix/BaseQuickfixProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/quickfix/BaseQuickfixProvider.java
index 01e9cd6..25676cf 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/quickfix/BaseQuickfixProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/quickfix/BaseQuickfixProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/quickfix/ExtensibleQuickfixProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/quickfix/ExtensibleQuickfixProvider.java
index aba2e0c..6fbd3ac 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/quickfix/ExtensibleQuickfixProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/quickfix/ExtensibleQuickfixProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ContainerContentProvider.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ContainerContentProvider.java
index ce039c1..46cd4c7 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ContainerContentProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ContainerContentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ContainerSelectionGroup.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ContainerSelectionGroup.java
index 60ea8f6..fa106a6 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ContainerSelectionGroup.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ContainerSelectionGroup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ResourceAndContainerGroup.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ResourceAndContainerGroup.java
index 53664da..c4d580d 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ResourceAndContainerGroup.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/ripoffs/ResourceAndContainerGroup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/syntaxcoloring/BaseAntlrTokenToAttributeIdMapper.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/syntaxcoloring/BaseAntlrTokenToAttributeIdMapper.java
index e13c0a9..7e34b36 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/syntaxcoloring/BaseAntlrTokenToAttributeIdMapper.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/syntaxcoloring/BaseAntlrTokenToAttributeIdMapper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/utilities/BaseUIUtil.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/utilities/BaseUIUtil.java
index 6b52aa9..57addb2 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/utilities/BaseUIUtil.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/utilities/BaseUIUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/utilities/PDEUtils.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/utilities/PDEUtils.java
index 7dd95ed..b407cd7 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/utilities/PDEUtils.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/utilities/PDEUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (Obeo) - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileDialog.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileDialog.java
index 0c4c8d5..52c0d3e 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileDialog.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileNewWizard.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileNewWizard.java
index caf5cea..a1fea1c 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileNewWizard.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileNewWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileNewWizardPage.java b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileNewWizardPage.java
index 79734a9..73aeb2f 100644
--- a/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileNewWizardPage.java
+++ b/plugins/org.eclipse.ocl.xtext.base.ui/src/org/eclipse/ocl/xtext/base/ui/wizards/AbstractFileNewWizardPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.xtext.base/about.html b/plugins/org.eclipse.ocl.xtext.base/about.html
index c0be2e9..e9d1dac 100644
--- a/plugins/org.eclipse.ocl.xtext.base/about.html
+++ b/plugins/org.eclipse.ocl.xtext.base/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.xtext.base/build.properties b/plugins/org.eclipse.ocl.xtext.base/build.properties
index bd1755f..6681643 100644
--- a/plugins/org.eclipse.ocl.xtext.base/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.base/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AnnotationCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AnnotationCS.java
index 4dcb9da..bccfb04 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AnnotationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AnnotationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AnnotationElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AnnotationElementCS.java
index 6aacccc..3542409 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AnnotationElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AnnotationElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AttributeCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AttributeCS.java
index e9a249c..b4084d1 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AttributeCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/AttributeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSFactory.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSFactory.java
index 114488d..ec350a9 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSPackage.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSPackage.java
index 008ba18..79c6018 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSPackage.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ClassCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ClassCS.java
index bbf9c8e..6e19814 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ClassCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ClassCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ConstraintCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ConstraintCS.java
index 251c8d6..3ca5919 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ConstraintCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ConstraintCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ContextLessElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ContextLessElementCS.java
index 1f56848..17a8d6f 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ContextLessElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ContextLessElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DataTypeCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DataTypeCS.java
index 439717e..2b9996a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DataTypeCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DataTypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DetailCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DetailCS.java
index 9a2985c..0779047 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DetailCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DetailCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DocumentationCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DocumentationCS.java
index 85f75c3..9539da7 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DocumentationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/DocumentationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ElementCS.java
index c77764d..e94f415 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ElementRefCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ElementRefCS.java
index 6d6dc03..518f0ba 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ElementRefCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ElementRefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/EnumerationCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/EnumerationCS.java
index 500d10d..6303069 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/EnumerationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/EnumerationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/EnumerationLiteralCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/EnumerationLiteralCS.java
index 1d50bcb..8760135e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/EnumerationLiteralCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/EnumerationLiteralCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/FeatureCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/FeatureCS.java
index 74f42a1..b982447 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/FeatureCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/FeatureCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ImportCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ImportCS.java
index 3a3e1ba..ca0a2ba 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ImportCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ImportCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/LambdaTypeCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/LambdaTypeCS.java
index 8967df4..ba53db0 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/LambdaTypeCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/LambdaTypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ModelElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ModelElementCS.java
index c2af0ba..deb26c2 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ModelElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ModelElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ModelElementRefCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ModelElementRefCS.java
index 0d0ff58..1d3f9b1 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ModelElementRefCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ModelElementRefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityBoundsCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityBoundsCS.java
index fb878f1..8763cac 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityBoundsCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityBoundsCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityCS.java
index ab87935..af7ab0b 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityStringCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityStringCS.java
index e95136e..531ad1a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityStringCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/MultiplicityStringCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/NamedElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/NamedElementCS.java
index 59ef7ea..d46fcab 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/NamedElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/NamedElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/NamespaceCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/NamespaceCS.java
index ec043a1..e1c75a6 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/NamespaceCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/NamespaceCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/OperationCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/OperationCS.java
index caaf4cb..e1dc068 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/OperationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/OperationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PackageCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PackageCS.java
index fe81790..2392576 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PackageCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PackageCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PackageOwnerCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PackageOwnerCS.java
index fa90830..77d0a73 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PackageOwnerCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PackageOwnerCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ParameterCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ParameterCS.java
index 70e219a..16e924a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ParameterCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ParameterCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathElementCS.java
index d8c8106..0b68ee7 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathElementWithURICS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathElementWithURICS.java
index e7ce76d..56de509 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathElementWithURICS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathElementWithURICS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathNameCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathNameCS.java
index 254cd04..56ab3e2 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathNameCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PathNameCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PivotableElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PivotableElementCS.java
index 1204e5d..d53573d 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PivotableElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PivotableElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PrimitiveTypeRefCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PrimitiveTypeRefCS.java
index 5035eb6..3d3f72a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PrimitiveTypeRefCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/PrimitiveTypeRefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ReferenceCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ReferenceCS.java
index 6e6f5ba..1758337 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ReferenceCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/ReferenceCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/RootCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/RootCS.java
index 4d3103d..a46dcda 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/RootCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/RootCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/RootPackageCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/RootPackageCS.java
index 6a77acf..44c1643 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/RootPackageCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/RootPackageCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/SpecificationCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/SpecificationCS.java
index 61ae9da..56f02e7 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/SpecificationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/SpecificationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/StructuralFeatureCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/StructuralFeatureCS.java
index 6c2be87..83528bd 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/StructuralFeatureCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/StructuralFeatureCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/StructuredClassCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/StructuredClassCS.java
index 961adae..6ffd694 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/StructuredClassCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/StructuredClassCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateBindingCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateBindingCS.java
index c8298d8..12519d7 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateBindingCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateBindingCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateParameterCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateParameterCS.java
index 46f452d..0b1c227 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateParameterCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateParameterCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateParameterSubstitutionCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateParameterSubstitutionCS.java
index 53a571c..cdf476e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateParameterSubstitutionCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateParameterSubstitutionCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateSignatureCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateSignatureCS.java
index f2f3166..3258640 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateSignatureCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateSignatureCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateableElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateableElementCS.java
index ec25585..14c5cbf 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateableElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TemplateableElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TuplePartCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TuplePartCS.java
index 7008a8e..9d486d0 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TuplePartCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TuplePartCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TupleTypeCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TupleTypeCS.java
index b31285a..c440520 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TupleTypeCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TupleTypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeCS.java
index d3e8525..7cca360 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeParameterCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeParameterCS.java
index a55980c..8e8e64b 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeParameterCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeParameterCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeRefCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeRefCS.java
index d768d45..c90c917 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeRefCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypeRefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedElementCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedElementCS.java
index 664a881..c282e4a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedElementCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedElementCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedRefCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedRefCS.java
index befabcd..26b9861 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedRefCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedRefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedTypeRefCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedTypeRefCS.java
index 51aa7c3..7e9d0df 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedTypeRefCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/TypedTypeRefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/WildcardTypeRefCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/WildcardTypeRefCS.java
index 146046d..a20c2a3 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/WildcardTypeRefCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/WildcardTypeRefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AnnotationCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AnnotationCSImpl.java
index f8fa74d..837456e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AnnotationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AnnotationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AnnotationElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AnnotationElementCSImpl.java
index f92969f..c22eb0e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AnnotationElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AnnotationElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AttributeCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AttributeCSImpl.java
index 48a0734..447d109 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AttributeCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/AttributeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSFactoryImpl.java
index 21acd60..b565c5c 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSPackageImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSPackageImpl.java
index 4b657ad..31bf3d6 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSPackageImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ClassCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ClassCSImpl.java
index 3218127..f2ab295 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ClassCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ClassCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ConstraintCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ConstraintCSImpl.java
index 2459128..3a65e8d 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ConstraintCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ConstraintCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ContextLessElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ContextLessElementCSImpl.java
index 1096002..dcb2e90 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ContextLessElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ContextLessElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DataTypeCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DataTypeCSImpl.java
index 56be3fe..ab60bb6 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DataTypeCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DataTypeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DetailCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DetailCSImpl.java
index d0cd319..8f47097 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DetailCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DetailCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DocumentationCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DocumentationCSImpl.java
index 04c7866..427540d 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DocumentationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/DocumentationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ElementCSImpl.java
index 5bfd9d4..ca66f0f 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ElementRefCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ElementRefCSImpl.java
index 60651ad..e374598 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ElementRefCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ElementRefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/EnumerationCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/EnumerationCSImpl.java
index 5d252cf..fce0ee2 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/EnumerationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/EnumerationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/EnumerationLiteralCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/EnumerationLiteralCSImpl.java
index 728320c..176561e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/EnumerationLiteralCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/EnumerationLiteralCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/FeatureCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/FeatureCSImpl.java
index f37d850..dc8a3bd 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/FeatureCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/FeatureCSImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ImportCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ImportCSImpl.java
index cc7ff4d..0d5d74f 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ImportCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ImportCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/LambdaTypeCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/LambdaTypeCSImpl.java
index 502167c..d393180 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/LambdaTypeCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/LambdaTypeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ModelElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ModelElementCSImpl.java
index 6050ef0..09531e1 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ModelElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ModelElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ModelElementRefCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ModelElementRefCSImpl.java
index 89e6a4a..efb9717 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ModelElementRefCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ModelElementRefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityBoundsCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityBoundsCSImpl.java
index 540a242..cb4b5b8 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityBoundsCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityBoundsCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityCSImpl.java
index 3236e08..faddb75 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityStringCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityStringCSImpl.java
index 745b7e6..3635a33 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityStringCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/MultiplicityStringCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/NamedElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/NamedElementCSImpl.java
index 1e97ec1..4b7e01e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/NamedElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/NamedElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/NamespaceCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/NamespaceCSImpl.java
index ef093dd..bf73a16 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/NamespaceCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/NamespaceCSImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/OperationCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/OperationCSImpl.java
index e7f2213..1b5ca1e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/OperationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/OperationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PackageCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PackageCSImpl.java
index 4f33674..20644f0 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PackageCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PackageCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PackageOwnerCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PackageOwnerCSImpl.java
index 83669f2..0591439 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PackageOwnerCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PackageOwnerCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ParameterCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ParameterCSImpl.java
index 01cd91e..d5616ba 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ParameterCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ParameterCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathElementCSImpl.java
index 93c62dd..b662971 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathElementWithURICSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathElementWithURICSImpl.java
index 32d39ab..ee53fca 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathElementWithURICSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathElementWithURICSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathNameCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathNameCSImpl.java
index fb9f74f..0a2e255 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathNameCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PathNameCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PivotableElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PivotableElementCSImpl.java
index db902ec..82c880e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PivotableElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PivotableElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PrimitiveTypeRefCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PrimitiveTypeRefCSImpl.java
index 0c78d7a..0ba2823 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PrimitiveTypeRefCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/PrimitiveTypeRefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ReferenceCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ReferenceCSImpl.java
index 9617f33..cf33e05 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ReferenceCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/ReferenceCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/RootCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/RootCSImpl.java
index 3a4be73..dadce67 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/RootCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/RootCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/RootPackageCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/RootPackageCSImpl.java
index 5abec3d..3a0fd9e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/RootPackageCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/RootPackageCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/SpecificationCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/SpecificationCSImpl.java
index 0fbbe13..dd0baa3 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/SpecificationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/SpecificationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/StructuralFeatureCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/StructuralFeatureCSImpl.java
index cce7c97..dfd8619 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/StructuralFeatureCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/StructuralFeatureCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/StructuredClassCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/StructuredClassCSImpl.java
index 83d82a5..22c7e65 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/StructuredClassCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/StructuredClassCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateBindingCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateBindingCSImpl.java
index c711751..7fdbef8 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateBindingCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateBindingCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateParameterCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateParameterCSImpl.java
index b0c190c..49e90c3 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateParameterCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateParameterCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateParameterSubstitutionCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateParameterSubstitutionCSImpl.java
index 5613178..c2c2b84 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateParameterSubstitutionCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateParameterSubstitutionCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateSignatureCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateSignatureCSImpl.java
index 2768c94..15f1c9c 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateSignatureCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateSignatureCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateableElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateableElementCSImpl.java
index 8e16d5b..9a2ff5b 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateableElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TemplateableElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TuplePartCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TuplePartCSImpl.java
index d1114e3..8cca54b 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TuplePartCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TuplePartCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TupleTypeCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TupleTypeCSImpl.java
index 784682e..86b889c 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TupleTypeCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TupleTypeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeCSImpl.java
index 59d9550..8e52a2e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeCSImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeParameterCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeParameterCSImpl.java
index 0c92f15..23f99ac 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeParameterCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeParameterCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeRefCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeRefCSImpl.java
index 14215c3..7c41ecb 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeRefCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypeRefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedElementCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedElementCSImpl.java
index 682797d..5c2f294 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedElementCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedElementCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedRefCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedRefCSImpl.java
index 7817ce8..8fac330 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedRefCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedRefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedTypeRefCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedTypeRefCSImpl.java
index 61e1edb..43b7588 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedTypeRefCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/TypedTypeRefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/WildcardTypeRefCSImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/WildcardTypeRefCSImpl.java
index f3e3107..fcaafc9 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/WildcardTypeRefCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/WildcardTypeRefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractBaseCSVisitor.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractBaseCSVisitor.java
index ca72fe1..02f1c20 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractBaseCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractBaseCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractDelegatingBaseCSVisitor.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractDelegatingBaseCSVisitor.java
index 0159ec1..ec8df85 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractDelegatingBaseCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractDelegatingBaseCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractExtendingBaseCSVisitor.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractExtendingBaseCSVisitor.java
index 1c810a1..34a3299 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractExtendingBaseCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractExtendingBaseCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractNullBaseCSVisitor.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractNullBaseCSVisitor.java
index 2ad0204..ced435e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractNullBaseCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/AbstractNullBaseCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSAdapterFactory.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSAdapterFactory.java
index fc980c6..402bb72 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSSwitch.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSSwitch.java
index ac760b5..4d829a9 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSSwitch.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSValidator.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSValidator.java
index 96b76ea..a4b5ed6 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSVisitor.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSVisitor.java
index ad909f2..05077cb 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/BaseCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/DecorableBaseCSVisitor.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/DecorableBaseCSVisitor.java
index 4fdb5b6..4aab4be 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/DecorableBaseCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/DecorableBaseCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/VisitableCS.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/VisitableCS.java
index f14f86f..5f14233 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/VisitableCS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/util/VisitableCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/model/BaseCS.genmodel b/plugins/org.eclipse.ocl.xtext.base/model/BaseCS.genmodel
index a525510..a694e71 100644
--- a/plugins/org.eclipse.ocl.xtext.base/model/BaseCS.genmodel
+++ b/plugins/org.eclipse.ocl.xtext.base/model/BaseCS.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.xtext.base/emf-gen" editDirectory="/org.eclipse.ocl.xtext.base.edit/emf-gen"
     editorDirectory="/org.eclipse.ocl.xtext.base.editor/emf-gen" modelPluginID="org.eclipse.ocl.xtext.base"
     templateDirectory="/org.eclipse.ocl.examples.build/templates" redirection="" forceOverwrite="true"
diff --git a/plugins/org.eclipse.ocl.xtext.base/plugin.properties b/plugins/org.eclipse.ocl.xtext.base/plugin.properties
index 409b230..c9afafa 100644
--- a/plugins/org.eclipse.ocl.xtext.base/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.base/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/AbstractBaseRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/AbstractBaseRuntimeModule.java
index 1782def..5705d30 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/AbstractBaseRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/AbstractBaseRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/BaseGrammarResource.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/BaseGrammarResource.java
index 986bf90..464332d 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/BaseGrammarResource.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/BaseGrammarResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/BaseStandaloneSetupGenerated.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/BaseStandaloneSetupGenerated.java
index 6a1f2b4..fd04676 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/BaseStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/BaseStandaloneSetupGenerated.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/BaseAntlrTokenFileProvider.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/BaseAntlrTokenFileProvider.java
index eece7ac..838f0b0 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/BaseAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/BaseAntlrTokenFileProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/BaseParser.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/BaseParser.java
index afb4291..8d86cf8 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/BaseParser.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/BaseParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBase.g b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBase.g
index eb614ee..0ae5a3a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBase.g
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBase.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBaseLexer.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBaseLexer.java
index 50ac76c..f0b7e9d 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBaseLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBaseLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBaseParser.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBaseParser.java
index 720997d..4ee7f98 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBaseParser.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/parser/antlr/internal/InternalBaseParser.java
@@ -22,9 +22,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/serializer/AbstractBaseSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/serializer/AbstractBaseSemanticSequencer.java
index d6f022f..b3370bb 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/serializer/AbstractBaseSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/serializer/AbstractBaseSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/serializer/AbstractBaseSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/serializer/AbstractBaseSyntacticSequencer.java
index 8bbfac9..7a3da10 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/serializer/AbstractBaseSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/serializer/AbstractBaseSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/services/BaseGrammarAccess.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/services/BaseGrammarAccess.java
index e74a462..6cb659c 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/services/BaseGrammarAccess.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/services/BaseGrammarAccess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/validation/AbstractBaseJavaValidator.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/validation/AbstractBaseJavaValidator.java
index 4ce397b..800aa75 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/validation/AbstractBaseJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/validation/AbstractBaseJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/Base.xtext b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/Base.xtext
index d2847c7..3039ecf 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/Base.xtext
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/Base.xtext
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/BaseRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/BaseRuntimeModule.java
index 5eff227..1ce1850 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/BaseRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/BaseRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/BaseStandaloneSetup.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/BaseStandaloneSetup.java
index be3a36b..5d534ac 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/BaseStandaloneSetup.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/BaseStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AS2CS.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AS2CS.java
index b2595e7..d3e9a1e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AS2CS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AS2CS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AS2CSConversion.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AS2CSConversion.java
index f857628..26a8e8b 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AS2CSConversion.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AS2CSConversion.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AliasAnalysis.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AliasAnalysis.java
index 8a3a74b..72c5c66 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AliasAnalysis.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/AliasAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseAS2CS.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseAS2CS.java
index 025dec9..bf5d9cc 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseAS2CS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseAS2CS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseDeclarationVisitor.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseDeclarationVisitor.java
index 646e629..8339908 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseDeclarationVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseDeclarationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseLocationInFileProvider.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseLocationInFileProvider.java
index 560c58d..38f7060 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseLocationInFileProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseLocationInFileProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseReferenceVisitor.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseReferenceVisitor.java
index 3f55a19..9bccece 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseReferenceVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/as2cs/BaseReferenceVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/DebugPivotCSAttribution.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/DebugPivotCSAttribution.java
index f2d4333..2c0959f 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/DebugPivotCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/DebugPivotCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/ElementCSAttribution.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/ElementCSAttribution.java
index f0fab73..6d72f22 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/ElementCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/ElementCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/ImportCSAttribution.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/ImportCSAttribution.java
index 439d175..2625f64 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/ImportCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/ImportCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/PathElementCSAttribution.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/PathElementCSAttribution.java
index 7c259f6..c163030 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/PathElementCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/PathElementCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/PivotableElementCSAttribution.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/PivotableElementCSAttribution.java
index 2d650e7..76b766c 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/PivotableElementCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/PivotableElementCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/RootCSAttribution.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/RootCSAttribution.java
index 90c8122..bb779ea 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/RootCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/attributes/RootCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/AbstractDependency.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/AbstractDependency.java
index 41d2407..8a1e504 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/AbstractDependency.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/AbstractDependency.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/AmbiguitiesAdapter.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/AmbiguitiesAdapter.java
index 2b85a8a..c3d622a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/AmbiguitiesAdapter.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/AmbiguitiesAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCS2AS.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCS2AS.java
index c26223d..b96ddd9 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCS2AS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCS2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSContainmentVisitor.java
index 545eeff..690a64b 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSLeft2RightVisitor.java
index 2f2d963..aab9d78 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSPostOrderVisitor.java
index d23af5c..d10ef06 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSPreOrderVisitor.java
index 7db9c46..ae5aecf 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseFragmentProvider.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseFragmentProvider.java
index fa18724..230614c 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseFragmentProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BaseFragmentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BasicContinuation.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BasicContinuation.java
index d20a22f..6393475 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BasicContinuation.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BasicContinuation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BooleanDependency.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BooleanDependency.java
index 7821bdc..ce51e9f 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BooleanDependency.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/BooleanDependency.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2AS.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2AS.java
index 06bc4be..05ca1ad 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2AS.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2ASConversion.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2ASConversion.java
index 1f6ada9..094c718 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2ASConversion.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/CS2ASConversion.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Continuation.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Continuation.java
index 13a506f..2ced320 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Continuation.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Continuation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Continuations.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Continuations.java
index 624677c..678108a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Continuations.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Continuations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Dependency.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Dependency.java
index 27d7894..3575fe7 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Dependency.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/Dependency.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ExceptionAdapter.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ExceptionAdapter.java
index 465a1ca..351acab 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ExceptionAdapter.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ExceptionAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ImportDiagnostic.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ImportDiagnostic.java
index 9925340..00ccebf 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ImportDiagnostic.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ImportDiagnostic.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/InterDependency.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/InterDependency.java
index 28e4de2..217fa38 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/InterDependency.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/InterDependency.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/LibraryDiagnostic.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/LibraryDiagnostic.java
index f81e9a1..db0219f 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/LibraryDiagnostic.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/LibraryDiagnostic.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/MultipleContinuation.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/MultipleContinuation.java
index e3a256d..afeaab3 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/MultipleContinuation.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/MultipleContinuation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotDependencies.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotDependencies.java
index 2513aac..b89eb9c 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotDependencies.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotDependencies.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotDependency.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotDependency.java
index b84fbc0..7301988 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotDependency.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotDependency.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotHasSuperClassesDependency.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotHasSuperClassesDependency.java
index 9ba5597..2516821 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotHasSuperClassesDependency.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotHasSuperClassesDependency.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotTypeOfRefDependency.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotTypeOfRefDependency.java
index e66e1d9..a02a337 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotTypeOfRefDependency.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/PivotTypeOfRefDependency.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/SingleContinuation.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/SingleContinuation.java
index ba45951..7149d8e 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/SingleContinuation.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/SingleContinuation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ValidationDiagnostic.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ValidationDiagnostic.java
index fa6ff5d..6d916ad 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ValidationDiagnostic.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/cs2as/ValidationDiagnostic.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/formatting/AbstractBaseFormatter.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/formatting/AbstractBaseFormatter.java
index 36dae13..f7f0ff1 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/formatting/AbstractBaseFormatter.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/formatting/AbstractBaseFormatter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/formatting/BaseFormatter.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/formatting/BaseFormatter.java
index abe1b16..ded441a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/formatting/BaseFormatter.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/formatting/BaseFormatter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/AbstractJavaClassScope.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/AbstractJavaClassScope.java
index 7fa16ea..1ccfe97 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/AbstractJavaClassScope.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/AbstractJavaClassScope.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/AbstractRootCSAttribution.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/AbstractRootCSAttribution.java
index f56ebe7..3989b75 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/AbstractRootCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/AbstractRootCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScopeProvider.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScopeProvider.java
index ac5224f..d0e7ac0 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScopeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScopeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScopeView.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScopeView.java
index 0ade65d..b204b59 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScopeView.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScopeView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScoping.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScoping.java
index 5d3c57c..82165a9 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScoping.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/BaseScoping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/IScopeView.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/IScopeView.java
index f4742fc..daa8b10 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/IScopeView.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/IScopeView.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/QualifiedPath.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/QualifiedPath.java
index 8c8c69e..420c5b6 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/QualifiedPath.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/scoping/QualifiedPath.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseCrossReferenceSerializer.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseCrossReferenceSerializer.java
index 40c48f6..3d74360 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseCrossReferenceSerializer.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseCrossReferenceSerializer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseHiddenTokenSequencer.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseHiddenTokenSequencer.java
index 33b78c1..d2844dd 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseHiddenTokenSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseHiddenTokenSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseSemanticSequencer.java
index a017120..186b48a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseSyntacticSequencer.java
index 20a4993..1f96530 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/serializer/BaseSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseLinkingDiagnosticMessageProvider.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseLinkingDiagnosticMessageProvider.java
index 36b8c9a..22480b3 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseLinkingDiagnosticMessageProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseLinkingDiagnosticMessageProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseLinkingService.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseLinkingService.java
index 9187880..f9a0c13 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseLinkingService.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseLinkingService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseQualifiedNameConverter.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseQualifiedNameConverter.java
index 53d7e12..35c6956 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseQualifiedNameConverter.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseQualifiedNameConverter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseQualifiedNameProvider.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseQualifiedNameProvider.java
index e6c5587..d97ab57 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseQualifiedNameProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseQualifiedNameProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseValueConverterService.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseValueConverterService.java
index c9c0fb4..f9564a9 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseValueConverterService.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BaseValueConverterService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BinaryGrammarResourceFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BinaryGrammarResourceFactoryImpl.java
index 656fb56..7f63e5f 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BinaryGrammarResourceFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/BinaryGrammarResourceFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 itemis AG (http://www.itemis.eu) 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 package org.eclipse.ocl.xtext.base.services;
 
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/PivotResourceServiceProvider.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/PivotResourceServiceProvider.java
index b507eb0..d9e2159 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/PivotResourceServiceProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/PivotResourceServiceProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/RetokenizingTokenSource.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/RetokenizingTokenSource.java
index 0cbbabd..64574d7 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/RetokenizingTokenSource.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/services/RetokenizingTokenSource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/AbstractExtendedParserContext.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/AbstractExtendedParserContext.java
index ea6fa75..a3e4cfd 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/AbstractExtendedParserContext.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/AbstractExtendedParserContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/AbstractGrammarResource.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/AbstractGrammarResource.java
index bd1e0a2..7c61d3d 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/AbstractGrammarResource.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/AbstractGrammarResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/BaseCSResource.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/BaseCSResource.java
index 1864bda..7bc2cc6 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/BaseCSResource.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/BaseCSResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/BasePlugin.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/BasePlugin.java
index c1f63bb..8f3da99 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/BasePlugin.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/BasePlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CS2ASLinker.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CS2ASLinker.java
index 027c3b0..cddf8f8 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CS2ASLinker.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CS2ASLinker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CSI.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CSI.java
index 370da53..adfad85 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CSI.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CSI.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CSI2ASMapping.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CSI2ASMapping.java
index a9eeb96..a9c329a 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CSI2ASMapping.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/CSI2ASMapping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/ElementUtil.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/ElementUtil.java
index 0ec1d39..b406106 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/ElementUtil.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/ElementUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/ExtendedParserContext.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/ExtendedParserContext.java
index 4cc23a3..2d9805f 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/ExtendedParserContext.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/ExtendedParserContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/NamedElementCSLabelGenerator.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/NamedElementCSLabelGenerator.java
index f88fa82..8a5e2d7 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/NamedElementCSLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/NamedElementCSLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotDiagnosticConverter.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotDiagnosticConverter.java
index 28fad44..f761337 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotDiagnosticConverter.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotDiagnosticConverter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotResourceValidator.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotResourceValidator.java
index a708dd3..9e276d4 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotResourceValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotResourceValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/validation/BaseJavaValidator.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/validation/BaseJavaValidator.java
index 1155211..fddcdd8 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/validation/BaseJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/validation/BaseJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/about.html b/plugins/org.eclipse.ocl.xtext.completeocl.ui/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/about.html
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/build.properties b/plugins/org.eclipse.ocl.xtext.completeocl.ui/build.properties
index 31b14b6..9696c07 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/plugin.properties b/plugins/org.eclipse.ocl.xtext.completeocl.ui/plugin.properties
index 3e59825..3359d2e 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/AbstractCompleteOCLUiModule.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/AbstractCompleteOCLUiModule.java
index 90ec2f1..396bf2a 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/AbstractCompleteOCLUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/AbstractCompleteOCLUiModule.java
@@ -2,9 +2,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLExecutableExtensionFactory.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLExecutableExtensionFactory.java
index 9420770..1f08ef3 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLExecutableExtensionFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLExecutableExtensionFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/AbstractCompleteOCLProposalProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/AbstractCompleteOCLProposalProvider.java
index a3172ab..7c9a553 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/AbstractCompleteOCLProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/AbstractCompleteOCLProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/CompleteOCLParser.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/CompleteOCLParser.java
index e347a29..d9ec789 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/CompleteOCLParser.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/CompleteOCLParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCL.g b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCL.g
index 5ecaae4..127d471 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCL.g
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCL.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCLLexer.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCLLexer.java
index c4f4054..39df467 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCLLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCLLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCLParser.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCLParser.java
index 0ea33c3..db066bb 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCLParser.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/contentassist/antlr/internal/InternalCompleteOCLParser.java
@@ -23,9 +23,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/internal/CompleteOCLActivator.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/internal/CompleteOCLActivator.java
index 7921c6f..75c046d 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/internal/CompleteOCLActivator.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src-gen/org/eclipse/ocl/xtext/completeocl/ui/internal/CompleteOCLActivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLDocumentProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLDocumentProvider.java
index 103cbc2..8bf7465 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLDocumentProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLDocumentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLEditor.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLEditor.java
index 65ada17..d99b584 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLEditor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLEditor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLUiModule.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLUiModule.java
index 3317b8c..6fabfd9 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/CompleteOCLUiModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/commands/ExportCompleteOCLHandler.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/commands/ExportCompleteOCLHandler.java
index 009fd53..4e14db8 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/commands/ExportCompleteOCLHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/commands/ExportCompleteOCLHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/commands/LoadCompleteOCLResourceHandler.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/commands/LoadCompleteOCLResourceHandler.java
index ea05436..e8ae55a 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/commands/LoadCompleteOCLResourceHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/commands/LoadCompleteOCLResourceHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/contentassist/CompleteOCLProposalProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/contentassist/CompleteOCLProposalProvider.java
index de7647a..5fadb48 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/contentassist/CompleteOCLProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/contentassist/CompleteOCLProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/labeling/CompleteOCLDescriptionLabelProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/labeling/CompleteOCLDescriptionLabelProvider.java
index c6b84be..35b75cf 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/labeling/CompleteOCLDescriptionLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/labeling/CompleteOCLDescriptionLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/labeling/CompleteOCLLabelProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/labeling/CompleteOCLLabelProvider.java
index d927351..e8843b4 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/labeling/CompleteOCLLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/labeling/CompleteOCLLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/messages/CompleteOCLUIMessages.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/messages/CompleteOCLUIMessages.java
index 8988116..4902f15 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/messages/CompleteOCLUIMessages.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/messages/CompleteOCLUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/messages/CompleteOCLUIMessages.properties b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/messages/CompleteOCLUIMessages.properties
index 336f17f..c3ce810 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/messages/CompleteOCLUIMessages.properties
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/messages/CompleteOCLUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Obeo 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/outline/CompleteOCLOutlineTreeProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/outline/CompleteOCLOutlineTreeProvider.java
index d082343..addfc4f 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/outline/CompleteOCLOutlineTreeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/outline/CompleteOCLOutlineTreeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/quickfix/CompleteOCLQuickfixProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/quickfix/CompleteOCLQuickfixProvider.java
index 5963b7c..b7a6bc5 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/quickfix/CompleteOCLQuickfixProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/quickfix/CompleteOCLQuickfixProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/wizards/CompleteOCLFileDialog.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/wizards/CompleteOCLFileDialog.java
index 21d0486..40a7c07 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/wizards/CompleteOCLFileDialog.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/wizards/CompleteOCLFileDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/wizards/CompleteOCLFileNewWizard.java b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/wizards/CompleteOCLFileNewWizard.java
index ebb2e0a..e86cc03 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/wizards/CompleteOCLFileNewWizard.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/src/org/eclipse/ocl/xtext/completeocl/ui/wizards/CompleteOCLFileNewWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/about.html b/plugins/org.eclipse.ocl.xtext.completeocl/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/about.html
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/build.properties b/plugins/org.eclipse.ocl.xtext.completeocl/build.properties
index c0adb1d..c98456c 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/ClassifierContextDeclCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/ClassifierContextDeclCS.java
index 7f4705e..e494200 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/ClassifierContextDeclCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/ClassifierContextDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLCSFactory.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLCSFactory.java
index 62e73d6..805439c 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLCSFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLCSFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLCSPackage.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLCSPackage.java
index 41b4d27..7995e44 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLCSPackage.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLCSPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLDocumentCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLDocumentCS.java
index 520893c..1f5c4c5 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLDocumentCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/CompleteOCLDocumentCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/ContextDeclCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/ContextDeclCS.java
index 33ba1f8..61e7f5c 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/ContextDeclCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/ContextDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefCS.java
index d47c8e8..3b35e24 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefOperationCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefOperationCS.java
index 0ee32fb..f19e4e7 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefOperationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefOperationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefPropertyCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefPropertyCS.java
index f2511bc..fe9cd89 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefPropertyCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/DefPropertyCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/FeatureContextDeclCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/FeatureContextDeclCS.java
index c2c1558..6cdec3d 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/FeatureContextDeclCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/FeatureContextDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/OCLMessageArgCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/OCLMessageArgCS.java
index 34e89aa..d5c886b 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/OCLMessageArgCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/OCLMessageArgCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/OperationContextDeclCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/OperationContextDeclCS.java
index 224284f..bf67095 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/OperationContextDeclCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/OperationContextDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PackageDeclarationCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PackageDeclarationCS.java
index ebd424e..1c8cb7f 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PackageDeclarationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PackageDeclarationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PathNameDeclCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PathNameDeclCS.java
index 26639ad..0bc0abe 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PathNameDeclCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PathNameDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PropertyContextDeclCS.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PropertyContextDeclCS.java
index d6ea29a..27f90cf 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PropertyContextDeclCS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/PropertyContextDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/ClassifierContextDeclCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/ClassifierContextDeclCSImpl.java
index 61f8207..948152f 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/ClassifierContextDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/ClassifierContextDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLCSFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLCSFactoryImpl.java
index 48c155c..2ab24e5 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLCSFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLCSFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLCSPackageImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLCSPackageImpl.java
index 0445118..8050669 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLCSPackageImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLCSPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLDocumentCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLDocumentCSImpl.java
index db40a83..7b69894 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLDocumentCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/CompleteOCLDocumentCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/ContextDeclCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/ContextDeclCSImpl.java
index f8bfc5e..eed76a5 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/ContextDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/ContextDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefCSImpl.java
index 89cfa2d..53e8c3b 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefOperationCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefOperationCSImpl.java
index bad9c0f..b7ddb89 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefOperationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefOperationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefPropertyCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefPropertyCSImpl.java
index 57b9c22..d38d9b7 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefPropertyCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/DefPropertyCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/FeatureContextDeclCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/FeatureContextDeclCSImpl.java
index 58d6115..38a6b04 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/FeatureContextDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/FeatureContextDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/OCLMessageArgCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/OCLMessageArgCSImpl.java
index 78ab28f..7af4b68 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/OCLMessageArgCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/OCLMessageArgCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/OperationContextDeclCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/OperationContextDeclCSImpl.java
index f7bb2b7..ae8aa17 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/OperationContextDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/OperationContextDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PackageDeclarationCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PackageDeclarationCSImpl.java
index 0584068..e0ebce9 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PackageDeclarationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PackageDeclarationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PathNameDeclCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PathNameDeclCSImpl.java
index daed190..02a0f0b 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PathNameDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PathNameDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PropertyContextDeclCSImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PropertyContextDeclCSImpl.java
index 19f1cf2..0aa9803 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PropertyContextDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/impl/PropertyContextDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSContainmentVisitor.java
index 9008264..e4cd2ba 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSLeft2RightVisitor.java
index 3f70d79..ac9bb9d 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSPostOrderVisitor.java
index c2c8077..f1bcafa 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSPreOrderVisitor.java
index d76af9a..a50bd2b 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSVisitor.java
index cad1157..00e763c 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractCompleteOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractDelegatingCompleteOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractDelegatingCompleteOCLCSVisitor.java
index 6e94893..fd0500a 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractDelegatingCompleteOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractDelegatingCompleteOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractExtendingCompleteOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractExtendingCompleteOCLCSVisitor.java
index 7a3b602..5ce719a 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractExtendingCompleteOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractExtendingCompleteOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractNullCompleteOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractNullCompleteOCLCSVisitor.java
index 366eb15..f0b0544 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractNullCompleteOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/AbstractNullCompleteOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSAdapterFactory.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSAdapterFactory.java
index 80f4354..d8a7191 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSSwitch.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSSwitch.java
index 9ac180b..8d4eca0 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSSwitch.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSVisitor.java
index 3acbf5c..ca6050b 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/CompleteOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/DecorableCompleteOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/DecorableCompleteOCLCSVisitor.java
index ea6aca4..7f2cf40 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/DecorableCompleteOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/emf-gen/org/eclipse/ocl/xtext/completeoclcs/util/DecorableCompleteOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/model/CompleteOCLCS.genmodel b/plugins/org.eclipse.ocl.xtext.completeocl/model/CompleteOCLCS.genmodel
index 31cde9f..4e2cf47 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/model/CompleteOCLCS.genmodel
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/model/CompleteOCLCS.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.xtext.completeocl/emf-gen" editDirectory="/org.eclipse.ocl.xtext.completeocl.edit/emf-gen"
     editorDirectory="/org.eclipse.ocl.xtext.completeocl.editor/emf-gen" modelPluginID="org.eclipse.ocl.xtext.completeocl"
     forceOverwrite="true" modelName="CompleteOCLCS" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/plugin.properties b/plugins/org.eclipse.ocl.xtext.completeocl/plugin.properties
index c9e4690..3698199 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/AbstractCompleteOCLRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/AbstractCompleteOCLRuntimeModule.java
index b7037b8..3284806 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/AbstractCompleteOCLRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/AbstractCompleteOCLRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/CompleteOCLGrammarResource.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/CompleteOCLGrammarResource.java
index 72976c7..4a920f4 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/CompleteOCLGrammarResource.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/CompleteOCLGrammarResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/CompleteOCLStandaloneSetupGenerated.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/CompleteOCLStandaloneSetupGenerated.java
index cec9508..b9b3515 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/CompleteOCLStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/CompleteOCLStandaloneSetupGenerated.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/CompleteOCLAntlrTokenFileProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/CompleteOCLAntlrTokenFileProvider.java
index 8c4e1c5..20ad28e 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/CompleteOCLAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/CompleteOCLAntlrTokenFileProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/CompleteOCLParser.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/CompleteOCLParser.java
index 5a74d13..f37a095 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/CompleteOCLParser.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/CompleteOCLParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCL.g b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCL.g
index f1c6109..f9ab7cd 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCL.g
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCL.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCLLexer.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCLLexer.java
index 9a4fabe..2e37798 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCLLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCLLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCLParser.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCLParser.java
index f37ec93..f4d6f68 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCLParser.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/parser/antlr/internal/InternalCompleteOCLParser.java
@@ -22,9 +22,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/serializer/AbstractCompleteOCLSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/serializer/AbstractCompleteOCLSemanticSequencer.java
index 538f757..9ce5048 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/serializer/AbstractCompleteOCLSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/serializer/AbstractCompleteOCLSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/serializer/AbstractCompleteOCLSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/serializer/AbstractCompleteOCLSyntacticSequencer.java
index e708f84..b5e30fe 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/serializer/AbstractCompleteOCLSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/serializer/AbstractCompleteOCLSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/services/CompleteOCLGrammarAccess.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/services/CompleteOCLGrammarAccess.java
index ea883f3..6625f28 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/services/CompleteOCLGrammarAccess.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/services/CompleteOCLGrammarAccess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/validation/AbstractCompleteOCLJavaValidator.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/validation/AbstractCompleteOCLJavaValidator.java
index de625df..d858a23 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/validation/AbstractCompleteOCLJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/validation/AbstractCompleteOCLJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCL.properties b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCL.properties
index 8968bc8..45b07a8 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCL.properties
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCL.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCL.xtext b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCL.xtext
index 535eab5..3ce9316 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCL.xtext
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCL.xtext
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCLRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCLRuntimeModule.java
index ab128d1..89a0002 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCLRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCLRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCLStandaloneSetup.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCLStandaloneSetup.java
index d315e7d..d11d5d1 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCLStandaloneSetup.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/CompleteOCLStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLAS2CS.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLAS2CS.java
index dce2b44..964c553 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLAS2CS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLAS2CS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLDeclarationVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLDeclarationVisitor.java
index f2584a5..560ebab 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLDeclarationVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLDeclarationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLSplitter.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLSplitter.java
index ece74fe..10230f8 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLSplitter.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/as2cs/CompleteOCLSplitter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/ClassifierContextCSAttribution.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/ClassifierContextCSAttribution.java
index 63df754..a191ad7 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/ClassifierContextCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/ClassifierContextCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/CompleteOCLDocumentCSAttribution.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/CompleteOCLDocumentCSAttribution.java
index 4b8ab24..11a3ef2 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/CompleteOCLDocumentCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/CompleteOCLDocumentCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/OperationContextCSAttribution.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/OperationContextCSAttribution.java
index c7f9fdb..2b7474a 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/OperationContextCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/OperationContextCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/OperationContextFilter.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/OperationContextFilter.java
index bf7ddfa..8727d4d 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/OperationContextFilter.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/OperationContextFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/PackageDeclarationCSAttribution.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/PackageDeclarationCSAttribution.java
index 431010b..623c72c 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/PackageDeclarationCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/PackageDeclarationCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/PropertyContextCSAttribution.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/PropertyContextCSAttribution.java
index a752787..f0abb0e 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/PropertyContextCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/attributes/PropertyContextCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCS2AS.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCS2AS.java
index c457cb6..e3714ca 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCS2AS.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCS2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSContainmentVisitor.java
index d42d2df..890099d 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSLeft2RightVisitor.java
index dccf765..8562ef6 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSPostOrderVisitor.java
index dc3fc99..f6d4c5c 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSPreOrderVisitor.java
index c944b24..5c6ff5d 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/cs2as/CompleteOCLCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/formatting/CompleteOCLFormatter.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/formatting/CompleteOCLFormatter.java
index 13c7455..808fb2e 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/formatting/CompleteOCLFormatter.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/formatting/CompleteOCLFormatter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/scoping/CompleteOCLScopeProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/scoping/CompleteOCLScopeProvider.java
index 98a635a..4717420 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/scoping/CompleteOCLScopeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/scoping/CompleteOCLScopeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/scoping/CompleteOCLScoping.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/scoping/CompleteOCLScoping.java
index 9b46990..ed463de 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/scoping/CompleteOCLScoping.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/scoping/CompleteOCLScoping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/serializer/CompleteOCLSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/serializer/CompleteOCLSemanticSequencer.java
index ebcdcc1..02ab5d6 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/serializer/CompleteOCLSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/serializer/CompleteOCLSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/serializer/CompleteOCLSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/serializer/CompleteOCLSyntacticSequencer.java
index 6142969..251bfab 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/serializer/CompleteOCLSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/serializer/CompleteOCLSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/services/CompleteOCLHiddenTokenSequencer.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/services/CompleteOCLHiddenTokenSequencer.java
index 5e9b24d..ec0d529 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/services/CompleteOCLHiddenTokenSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/services/CompleteOCLHiddenTokenSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLAS2XMIidVisitor.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLAS2XMIidVisitor.java
index 54af0d4..e340987 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLAS2XMIidVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLASResourceFactory.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLASResourceFactory.java
index 86af812..14063d5 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLASResourceImpl.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLASResourceImpl.java
index bbc317e..c50a7aa 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLASResourceImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLASResourceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLCSResource.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLCSResource.java
index f1e5f3b..29e0567 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLCSResource.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLCSResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLLoader.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLLoader.java
index 8db5c03..ec2dede 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLLoader.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLLoader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (Obeo) - Add complete ocl registry to enable export and re-use CompleteOCL files
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLPlugin.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLPlugin.java
index 2f55a9b..007f241 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLPlugin.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/CompleteOCLPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/PathNameDeclCSLabelGenerator.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/PathNameDeclCSLabelGenerator.java
index 59c1e72..a734d9d 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/PathNameDeclCSLabelGenerator.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/utilities/PathNameDeclCSLabelGenerator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLConstraintProvider.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLConstraintProvider.java
index f2f21b0..5e6cff5 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLConstraintProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLConstraintProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLEObjectValidator.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLEObjectValidator.java
index 708f11c..82b70df 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLEObjectValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLEObjectValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLJavaValidator.java b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLJavaValidator.java
index 186ea2b..732cc13 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src/org/eclipse/ocl/xtext/completeocl/validation/CompleteOCLJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/about.html b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/about.html
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/build.properties b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/build.properties
index 91f0906..c09f9e7 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/plugin.properties b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/plugin.properties
index cbee717..e8afe2b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/AbstractEssentialOCLUiModule.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/AbstractEssentialOCLUiModule.java
index a7ce458..d25bcdb 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/AbstractEssentialOCLUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/AbstractEssentialOCLUiModule.java
@@ -2,9 +2,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLExecutableExtensionFactory.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLExecutableExtensionFactory.java
index c39d620..1c4b549 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLExecutableExtensionFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLExecutableExtensionFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/AbstractEssentialOCLProposalProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/AbstractEssentialOCLProposalProvider.java
index 12be622..b46824f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/AbstractEssentialOCLProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/AbstractEssentialOCLProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/EssentialOCLParser.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/EssentialOCLParser.java
index 185f8a7..0f492ff 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/EssentialOCLParser.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/EssentialOCLParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCL.g b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCL.g
index 94d2ab3..2a78be7 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCL.g
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCL.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCLLexer.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCLLexer.java
index 9d07295..f19664f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCLLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCLLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCLParser.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCLParser.java
index aeec2f31..8f47939 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCLParser.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/antlr/internal/InternalEssentialOCLParser.java
@@ -23,9 +23,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/internal/EssentialOCLActivator.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/internal/EssentialOCLActivator.java
index d4f17f1..00e3bea 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/internal/EssentialOCLActivator.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src-gen/org/eclipse/ocl/xtext/essentialocl/ui/internal/EssentialOCLActivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLEditor.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLEditor.java
index 4e481a0..947749b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLEditor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLEditor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLUiModule.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLUiModule.java
index 6bb38c0..df9c407 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/EssentialOCLUiModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/EssentialOCLProposalProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/EssentialOCLProposalProvider.java
index dfdb20a..2fb3241 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/EssentialOCLProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/contentassist/EssentialOCLProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/labeling/EssentialOCLDescriptionLabelProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/labeling/EssentialOCLDescriptionLabelProvider.java
index 502c4a5..134d743 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/labeling/EssentialOCLDescriptionLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/labeling/EssentialOCLDescriptionLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/labeling/EssentialOCLLabelProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/labeling/EssentialOCLLabelProvider.java
index c8979c1..bf6f65f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/labeling/EssentialOCLLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/labeling/EssentialOCLLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/model/EssentialOCLDocumentProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/model/EssentialOCLDocumentProvider.java
index fd9d058..a54e803 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/model/EssentialOCLDocumentProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/model/EssentialOCLDocumentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/outline/EssentialOCLOutlineTreeProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/outline/EssentialOCLOutlineTreeProvider.java
index 2a36486..33bd41e 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/outline/EssentialOCLOutlineTreeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/outline/EssentialOCLOutlineTreeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/quickfix/EssentialOCLQuickfixProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/quickfix/EssentialOCLQuickfixProvider.java
index 7aba66c..8cb74fc 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/quickfix/EssentialOCLQuickfixProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/quickfix/EssentialOCLQuickfixProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/syntaxcoloring/EssentialOCLHighlightingConfiguration.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/syntaxcoloring/EssentialOCLHighlightingConfiguration.java
index 90062cd..f1fc744 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/syntaxcoloring/EssentialOCLHighlightingConfiguration.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/syntaxcoloring/EssentialOCLHighlightingConfiguration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/syntaxcoloring/EssentialOCLSemanticHighlightingCalculator.java b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/syntaxcoloring/EssentialOCLSemanticHighlightingCalculator.java
index 721b0f5..1d22142 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/syntaxcoloring/EssentialOCLSemanticHighlightingCalculator.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/src/org/eclipse/ocl/xtext/essentialocl/ui/syntaxcoloring/EssentialOCLSemanticHighlightingCalculator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/about.html b/plugins/org.eclipse.ocl.xtext.essentialocl/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/about.html
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/build.properties b/plugins/org.eclipse.ocl.xtext.essentialocl/build.properties
index faada41..3761725 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/AbstractNameExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/AbstractNameExpCS.java
index 19cb035..00e7b36 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/AbstractNameExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/AbstractNameExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/AssociationClassCallExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/AssociationClassCallExpCS.java
index 2718efa..a116ec3 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/AssociationClassCallExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/AssociationClassCallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/BooleanLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/BooleanLiteralExpCS.java
index 9824c5b..a3aeafa 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/BooleanLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/BooleanLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CallExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CallExpCS.java
index fb9e17c..7db05f1 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CallExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionLiteralExpCS.java
index 35cea8e..bc6af20 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionLiteralPartCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionLiteralPartCS.java
index ed43283..3a88e98 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionLiteralPartCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionLiteralPartCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionPatternCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionPatternCS.java
index 8300275..50d71f7 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionPatternCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionPatternCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionTypeCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionTypeCS.java
index 5f182e4..a11c7c0 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionTypeCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CollectionTypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ContextCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ContextCS.java
index eb7c7c3..e0ffe58 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ContextCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ContextCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CurlyBracketedClauseCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CurlyBracketedClauseCS.java
index df1d077..59f1269 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CurlyBracketedClauseCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/CurlyBracketedClauseCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSFactory.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSFactory.java
index 9bdd925..84f0a18 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSPackage.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSPackage.java
index 29b7ab0..379ac47 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSPackage.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ExpCS.java
index cd8bb1c..3f6df22 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ExpSpecificationCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ExpSpecificationCS.java
index 422178b..1bd2ec3 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ExpSpecificationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ExpSpecificationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IfExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IfExpCS.java
index 9fa482d..6afc697 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IfExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IfExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IfThenExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IfThenExpCS.java
index 500bf07..d3b82f3 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IfThenExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IfThenExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/InfixExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/InfixExpCS.java
index 03cc34e..120fe70 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/InfixExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/InfixExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/InvalidLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/InvalidLiteralExpCS.java
index 25ed408..f8515ae 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/InvalidLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/InvalidLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IterateCallExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IterateCallExpCS.java
index e9b5121..cf68c79 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IterateCallExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IterateCallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IterationCallExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IterationCallExpCS.java
index e4ab918..142661b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IterationCallExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/IterationCallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LambdaLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LambdaLiteralExpCS.java
index 55cae9d..a3ff5d2 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LambdaLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LambdaLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LetExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LetExpCS.java
index 9eafdbd..279286a 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LetExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LetExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LetVariableCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LetVariableCS.java
index 08a331a..a887de3 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LetVariableCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LetVariableCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LiteralExpCS.java
index 01d5f40..98a3c62 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/LiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapLiteralExpCS.java
index 3a024fa..753ad23 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapLiteralExpCS.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapLiteralPartCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapLiteralPartCS.java
index 278ff36..b10a5d0 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapLiteralPartCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapLiteralPartCS.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapTypeCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapTypeCS.java
index e919ece..f048d60 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapTypeCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/MapTypeCS.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NameExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NameExpCS.java
index d2ed30b..d2f0f48 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NameExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NameExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NavigatingArgCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NavigatingArgCS.java
index 781ccf4..413ff1c 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NavigatingArgCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NavigatingArgCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NavigationRole.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NavigationRole.java
index c8c952c..d9ade8b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NavigationRole.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NavigationRole.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NestedExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NestedExpCS.java
index ccf822f..8fa8f04 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NestedExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NestedExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NullLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NullLiteralExpCS.java
index a116395..2c812a7 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NullLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NullLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NumberLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NumberLiteralExpCS.java
index b323366..588094b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NumberLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/NumberLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/OperationCallExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/OperationCallExpCS.java
index 0aa1453..724e1d4 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/OperationCallExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/OperationCallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/OperatorExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/OperatorExpCS.java
index 3cd42c2..c05c788 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/OperatorExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/OperatorExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PatternExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PatternExpCS.java
index a05ad03..d8fdb44 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PatternExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PatternExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PrefixExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PrefixExpCS.java
index 8fc7372..ee45f49 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PrefixExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PrefixExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PrimitiveLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PrimitiveLiteralExpCS.java
index 341c8bc..9dcbbf2 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PrimitiveLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PrimitiveLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PropertyCallExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PropertyCallExpCS.java
index 15dba7e..0e5ee1b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PropertyCallExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/PropertyCallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/RoundBracketedClauseCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/RoundBracketedClauseCS.java
index b3041db..1fcca56 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/RoundBracketedClauseCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/RoundBracketedClauseCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/SelfExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/SelfExpCS.java
index 05f2674..46a986f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/SelfExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/SelfExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ShadowExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ShadowExpCS.java
index 7d50538..0c2efb1 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ShadowExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ShadowExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ShadowPartCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ShadowPartCS.java
index 5f66e07..e21e78a 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ShadowPartCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/ShadowPartCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/SquareBracketedClauseCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/SquareBracketedClauseCS.java
index 670ca22..bada9c1 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/SquareBracketedClauseCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/SquareBracketedClauseCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/StringLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/StringLiteralExpCS.java
index 9f5f322..8e12175 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/StringLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/StringLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TupleLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TupleLiteralExpCS.java
index ddf0ff1..63385fe 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TupleLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TupleLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TupleLiteralPartCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TupleLiteralPartCS.java
index 6014d16..aa82a9e 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TupleLiteralPartCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TupleLiteralPartCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TypeLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TypeLiteralExpCS.java
index 8f48db5..49ef194 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TypeLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TypeLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TypeNameExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TypeNameExpCS.java
index a12ba4a..05bc0ba 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TypeNameExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/TypeNameExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/UnlimitedNaturalLiteralExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/UnlimitedNaturalLiteralExpCS.java
index 94cd22e..5b80bc5 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/UnlimitedNaturalLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/UnlimitedNaturalLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/VariableCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/VariableCS.java
index d8020b9..c10ab40 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/VariableCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/VariableCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/VariableExpCS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/VariableExpCS.java
index 311156c..fe2b65f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/VariableExpCS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/VariableExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/AbstractNameExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/AbstractNameExpCSImpl.java
index 62dbb3b..4463928 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/AbstractNameExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/AbstractNameExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/AssociationClassCallExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/AssociationClassCallExpCSImpl.java
index e4c4757..af68794 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/AssociationClassCallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/AssociationClassCallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/BooleanLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/BooleanLiteralExpCSImpl.java
index 1562c29..a227452 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/BooleanLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/BooleanLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CallExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CallExpCSImpl.java
index c233326..66b3470 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionLiteralExpCSImpl.java
index 70e4a5f..760faf3 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionLiteralPartCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionLiteralPartCSImpl.java
index ca255db..16dcd56 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionLiteralPartCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionLiteralPartCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionPatternCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionPatternCSImpl.java
index 3adfe69..a6d4e7f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionPatternCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionPatternCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionTypeCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionTypeCSImpl.java
index 14d2620..0d0bd72 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionTypeCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CollectionTypeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ContextCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ContextCSImpl.java
index dd9875d..589214f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ContextCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ContextCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CurlyBracketedClauseCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CurlyBracketedClauseCSImpl.java
index 84d316f..4fae4f6 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CurlyBracketedClauseCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/CurlyBracketedClauseCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSFactoryImpl.java
index 491804c..de5fe78 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSPackageImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSPackageImpl.java
index 5d548d2..737948b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSPackageImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ExpCSImpl.java
index 19a696f..d305f9e 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ExpSpecificationCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ExpSpecificationCSImpl.java
index b576b3f..877538e 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ExpSpecificationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ExpSpecificationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IfExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IfExpCSImpl.java
index d57ecae..f1ed57c 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IfExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IfExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IfThenExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IfThenExpCSImpl.java
index 4b0b972..5b72f0b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IfThenExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IfThenExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/InfixExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/InfixExpCSImpl.java
index 524ffce..e5eeca8 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/InfixExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/InfixExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/InvalidLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/InvalidLiteralExpCSImpl.java
index f76d4a7..77ba888 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/InvalidLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/InvalidLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IterateCallExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IterateCallExpCSImpl.java
index 31a05ca..a24a61a 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IterateCallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IterateCallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IterationCallExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IterationCallExpCSImpl.java
index ccdaa1a..0936277 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IterationCallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/IterationCallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LambdaLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LambdaLiteralExpCSImpl.java
index 29684ff..0f10563 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LambdaLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LambdaLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LetExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LetExpCSImpl.java
index fe07360..a518bd1 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LetExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LetExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LetVariableCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LetVariableCSImpl.java
index 4b2a69e..ec8fc09 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LetVariableCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LetVariableCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LiteralExpCSImpl.java
index d4ad006..16649a2 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/LiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapLiteralExpCSImpl.java
index edffdc0..1c06e24 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapLiteralPartCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapLiteralPartCSImpl.java
index 289cb50..a5dba59 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapLiteralPartCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapLiteralPartCSImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapTypeCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapTypeCSImpl.java
index 2719874..9db89b5 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapTypeCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/MapTypeCSImpl.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NameExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NameExpCSImpl.java
index fbb31b7..9ae5a07 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NameExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NameExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NavigatingArgCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NavigatingArgCSImpl.java
index 3f19e48..6c4a547 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NavigatingArgCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NavigatingArgCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NestedExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NestedExpCSImpl.java
index de2339d..c6a29f2 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NestedExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NestedExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NullLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NullLiteralExpCSImpl.java
index 277a912..58c7f66 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NullLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NullLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NumberLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NumberLiteralExpCSImpl.java
index 52d4479..f5ba81b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NumberLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/NumberLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/OperationCallExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/OperationCallExpCSImpl.java
index 29d173a..6bbf077 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/OperationCallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/OperationCallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/OperatorExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/OperatorExpCSImpl.java
index 0e76a9a..fdeca68 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/OperatorExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/OperatorExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PatternExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PatternExpCSImpl.java
index 4b359bf..86aa5ce 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PatternExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PatternExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PrefixExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PrefixExpCSImpl.java
index ada7228..b4a0b30 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PrefixExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PrefixExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PrimitiveLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PrimitiveLiteralExpCSImpl.java
index 640ae55..2ea2a40 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PrimitiveLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PrimitiveLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PropertyCallExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PropertyCallExpCSImpl.java
index 178c590..4cdc511 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PropertyCallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/PropertyCallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/RoundBracketedClauseCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/RoundBracketedClauseCSImpl.java
index 8d92c1d..1813138 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/RoundBracketedClauseCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/RoundBracketedClauseCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/SelfExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/SelfExpCSImpl.java
index e5ec98d..bfed509 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/SelfExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/SelfExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ShadowExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ShadowExpCSImpl.java
index 070df98..c3cdb7f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ShadowExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ShadowExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ShadowPartCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ShadowPartCSImpl.java
index b0ee15c..61b7ccf 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ShadowPartCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/ShadowPartCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/SquareBracketedClauseCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/SquareBracketedClauseCSImpl.java
index 6dc8fde..73c5104 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/SquareBracketedClauseCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/SquareBracketedClauseCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/StringLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/StringLiteralExpCSImpl.java
index bedcc03..0cf5aed 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/StringLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/StringLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TupleLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TupleLiteralExpCSImpl.java
index 80d4bac..4ab8b82 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TupleLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TupleLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TupleLiteralPartCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TupleLiteralPartCSImpl.java
index f220d5d9..0daf581 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TupleLiteralPartCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TupleLiteralPartCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TypeLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TypeLiteralExpCSImpl.java
index 28e8c0d..e32c148 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TypeLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TypeLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TypeNameExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TypeNameExpCSImpl.java
index 36d47e0..8f50cb5 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TypeNameExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/TypeNameExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/UnlimitedNaturalLiteralExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/UnlimitedNaturalLiteralExpCSImpl.java
index 25ae479..6f2a532 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/UnlimitedNaturalLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/UnlimitedNaturalLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/VariableCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/VariableCSImpl.java
index ea37052..df12b91 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/VariableCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/VariableCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/VariableExpCSImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/VariableExpCSImpl.java
index f4351dc..7b9e064 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/VariableExpCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/VariableExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractDelegatingEssentialOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractDelegatingEssentialOCLCSVisitor.java
index 56b52d5..21331d9 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractDelegatingEssentialOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractDelegatingEssentialOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSContainmentVisitor.java
index 483cb71..cb41518 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSLeft2RightVisitor.java
index 5be5060..98e9d35 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSPostOrderVisitor.java
index 669037e..fe624de 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSPreOrderVisitor.java
index a5298d5..9f550cc 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSVisitor.java
index aebb342..36721f1d 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractEssentialOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractExtendingEssentialOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractExtendingEssentialOCLCSVisitor.java
index 1bcc250..b7ff99b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractExtendingEssentialOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractExtendingEssentialOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractNullEssentialOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractNullEssentialOCLCSVisitor.java
index 86f3097..0a21f86 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractNullEssentialOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/AbstractNullEssentialOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/DecorableEssentialOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/DecorableEssentialOCLCSVisitor.java
index e11c3a0..1786cb4 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/DecorableEssentialOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/DecorableEssentialOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSAdapterFactory.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSAdapterFactory.java
index 33df9e9..19ae7e5 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSSwitch.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSSwitch.java
index dcb45b8..78b2c4b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSSwitch.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSVisitor.java
index a0d7c72..1e9eb15 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/util/EssentialOCLCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.genmodel b/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.genmodel
index c2161ff..e8ac33a 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.genmodel
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.xtext.essentialocl/emf-gen" editDirectory="/org.eclipse.ocl.xtext.essentialocl.edit/emf-gen"
     editorDirectory="/org.eclipse.ocl.xtext.essentialocl.editor/emf-gen" modelPluginID="org.eclipse.ocl.xtext.essentialocl"
     forceOverwrite="true" modelName="EssentialOCLCS" nonNLSMarkers="true" codeFormatting="true"
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/plugin.properties b/plugins/org.eclipse.ocl.xtext.essentialocl/plugin.properties
index 27fbfab..7a03de5 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/AbstractEssentialOCLRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/AbstractEssentialOCLRuntimeModule.java
index 40574da..edf8967 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/AbstractEssentialOCLRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/AbstractEssentialOCLRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/EssentialOCLGrammarResource.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/EssentialOCLGrammarResource.java
index 091ca92..380a520 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/EssentialOCLGrammarResource.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/EssentialOCLGrammarResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/EssentialOCLStandaloneSetupGenerated.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/EssentialOCLStandaloneSetupGenerated.java
index 41062be..6d08ef4 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/EssentialOCLStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/EssentialOCLStandaloneSetupGenerated.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/EssentialOCLAntlrTokenFileProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/EssentialOCLAntlrTokenFileProvider.java
index 66120f2..4da05cd 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/EssentialOCLAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/EssentialOCLAntlrTokenFileProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/EssentialOCLParser.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/EssentialOCLParser.java
index a088100..b27502b 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/EssentialOCLParser.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/EssentialOCLParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCL.g b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCL.g
index 4b8cd62..a8019d0 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCL.g
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCL.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCLLexer.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCLLexer.java
index 6a24f1d..103c4b6 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCLLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCLLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCLParser.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCLParser.java
index 0282484..edc0347 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCLParser.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/parser/antlr/internal/InternalEssentialOCLParser.java
@@ -22,9 +22,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/serializer/AbstractEssentialOCLSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/serializer/AbstractEssentialOCLSemanticSequencer.java
index 5fb35f3..31a110c 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/serializer/AbstractEssentialOCLSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/serializer/AbstractEssentialOCLSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/serializer/AbstractEssentialOCLSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/serializer/AbstractEssentialOCLSyntacticSequencer.java
index 07a08c2..6c73416 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/serializer/AbstractEssentialOCLSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/serializer/AbstractEssentialOCLSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/services/EssentialOCLGrammarAccess.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/services/EssentialOCLGrammarAccess.java
index 5d08189..8231ffa 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/services/EssentialOCLGrammarAccess.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/services/EssentialOCLGrammarAccess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/validation/AbstractEssentialOCLJavaValidator.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/validation/AbstractEssentialOCLJavaValidator.java
index c94079d..7157667 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/validation/AbstractEssentialOCLJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/validation/AbstractEssentialOCLJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.properties b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.properties
index 5ce5af3..29b3b7f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.properties
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext
index d3d0ab6..e52a083 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCL.xtext
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCLRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCLRuntimeModule.java
index 89d252d..642edab 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCLRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCLRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCLStandaloneSetup.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCLStandaloneSetup.java
index f7fc5fc..5f05f04 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCLStandaloneSetup.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/EssentialOCLStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLAS2CS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLAS2CS.java
index c7d8fbd..08f8c36 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLAS2CS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLAS2CS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
index a334d76..19ad3f2 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLExpressionVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLExpressionVisitor.java
index e9ffaad..388be1a 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLExpressionVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLExpressionVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLLocationInFileProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLLocationInFileProvider.java
index c708b36..7a4babc 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLLocationInFileProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLLocationInFileProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLReferenceVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLReferenceVisitor.java
index 2ff90de..9a5798f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLReferenceVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLReferenceVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/AbstractOperationMatcher.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/AbstractOperationMatcher.java
index c6e8207..952fbcc 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/AbstractOperationMatcher.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/AbstractOperationMatcher.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/BinaryOperationMatcher.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/BinaryOperationMatcher.java
index d606744..29b5ab4 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/BinaryOperationMatcher.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/BinaryOperationMatcher.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/LetExpCSAttribution.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/LetExpCSAttribution.java
index 713b129..d5f78ba 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/LetExpCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/LetExpCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/LetVariableCSAttribution.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/LetVariableCSAttribution.java
index 0828058..0e029ab 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/LetVariableCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/LetVariableCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigatingArgCSAttribution.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigatingArgCSAttribution.java
index 931d578..ede7a08 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigatingArgCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigatingArgCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigationOperatorCSAttribution.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigationOperatorCSAttribution.java
index 95e10b6..098c2dc 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigationOperatorCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigationOperatorCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigationUtil.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigationUtil.java
index a61a43d..62b95d8 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigationUtil.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/NavigationUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/OperationMatcher.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/OperationMatcher.java
index d1dd06f..9b2a29c 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/OperationMatcher.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/OperationMatcher.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/ShadowPartCSAttribution.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/ShadowPartCSAttribution.java
index a12c36b..ef75dfb 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/ShadowPartCSAttribution.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/ShadowPartCSAttribution.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/UnaryOperationMatcher.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/UnaryOperationMatcher.java
index f0d8184..9dd8c1f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/UnaryOperationMatcher.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/attributes/UnaryOperationMatcher.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/AbstractImplicitSourceNamedElementIterator.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/AbstractImplicitSourceNamedElementIterator.java
index 112e671..0ba0344 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/AbstractImplicitSourceNamedElementIterator.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/AbstractImplicitSourceNamedElementIterator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2AS.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2AS.java
index 47027ae..6f5e3d6 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2AS.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2ASMessages.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2ASMessages.java
index 3888296..9f1a2d7 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2ASMessages.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2ASMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2ASMessages.properties b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2ASMessages.properties
index 455f9d4..2270b17 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2ASMessages.properties
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCS2ASMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2018 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSContainmentVisitor.java
index 3c1e9eb..4ec98dd 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSLeft2RightVisitor.java
index 8df21c0..b2cebc9 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSPostOrderVisitor.java
index e127611..4bfb423 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSPreOrderVisitor.java
index 8d24199..0a19155 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/EssentialOCLCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/ImplicitSourceTypeIterator.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/ImplicitSourceTypeIterator.java
index c1eed8f..bb09570 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/ImplicitSourceTypeIterator.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/ImplicitSourceTypeIterator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/ImplicitSourceVariableIterator.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/ImplicitSourceVariableIterator.java
index f907069..dabafb8 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/ImplicitSourceVariableIterator.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/cs2as/ImplicitSourceVariableIterator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/formatting/AbstractEssentialOCLFormatter.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/formatting/AbstractEssentialOCLFormatter.java
index 7d870d5..1ec480c 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/formatting/AbstractEssentialOCLFormatter.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/formatting/AbstractEssentialOCLFormatter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/formatting/EssentialOCLFormatter.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/formatting/EssentialOCLFormatter.java
index f5c6e15..0a29a03 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/formatting/EssentialOCLFormatter.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/formatting/EssentialOCLFormatter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCL.gi b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCL.gi
index b23ba51..f4e7424 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCL.gi
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCL.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -71,9 +71,9 @@
  *
  * Copyright (c) 2010, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCLKWLexer.gi b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCLKWLexer.gi
index a7dcce4..7bb5c98 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCLKWLexer.gi
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCLKWLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -46,9 +46,9 @@
  *
  * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCLLexer.gi b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCLLexer.gi
index 1011bb3..08b5cb8 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCLLexer.gi
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/EssentialOCLLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -89,9 +89,9 @@
  *
  * Copyright (c) 2010, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLKWLexer.gi b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLKWLexer.gi
index 1ea1055..22e0bb9 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLKWLexer.gi
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLKWLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -35,9 +35,9 @@
  *
  * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLLexer.gi b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLLexer.gi
index 45eabf3..d11b8f7 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLLexer.gi
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -48,9 +48,9 @@
  *
  * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLParser.g b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLParser.g
index 95bc206..c7f1653 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLParser.g
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/parser/OCLParser.g
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -41,9 +41,9 @@
  *
  * Copyright (c) 2010, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/scoping/EssentialOCLScopeProvider.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/scoping/EssentialOCLScopeProvider.java
index d5153dc..a0c1bc1 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/scoping/EssentialOCLScopeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/scoping/EssentialOCLScopeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/scoping/EssentialOCLScoping.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/scoping/EssentialOCLScoping.java
index 2a9dd5e..1ad3402 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/scoping/EssentialOCLScoping.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/scoping/EssentialOCLScoping.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/serializer/EssentialOCLSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/serializer/EssentialOCLSemanticSequencer.java
index 8d1ac2a..195372c 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/serializer/EssentialOCLSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/serializer/EssentialOCLSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/serializer/EssentialOCLSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/serializer/EssentialOCLSyntacticSequencer.java
index 5007876..8adcad5 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/serializer/EssentialOCLSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/serializer/EssentialOCLSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLASResourceFactory.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLASResourceFactory.java
index ed1dc8a..5c67a3a 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLCSResource.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLCSResource.java
index bec3a68..623a806 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLCSResource.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLCSResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLPlugin.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLPlugin.java
index 00b2815..bf76d58 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLPlugin.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/utilities/EssentialOCLPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/validation/EssentialOCLJavaValidator.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/validation/EssentialOCLJavaValidator.java
index b880ca3..b997182 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/validation/EssentialOCLJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/validation/EssentialOCLJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/about.html b/plugins/org.eclipse.ocl.xtext.markup.ui/about.html
index 53123dc..0831d75 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/about.html
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.xtext.markup.ui/build.properties b/plugins/org.eclipse.ocl.xtext.markup.ui/build.properties
index ed3dc6a..65221fe 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/plugin.properties b/plugins/org.eclipse.ocl.xtext.markup.ui/plugin.properties
index cd7b8f9..8021d0f 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/AbstractMarkupUiModule.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/AbstractMarkupUiModule.java
index ab58d2b..06344f2 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/AbstractMarkupUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/AbstractMarkupUiModule.java
@@ -2,9 +2,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/MarkupExecutableExtensionFactory.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/MarkupExecutableExtensionFactory.java
index a9ca92f..817052a 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/MarkupExecutableExtensionFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/MarkupExecutableExtensionFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/AbstractMarkupProposalProvider.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/AbstractMarkupProposalProvider.java
index 66695ba..1282eb9 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/AbstractMarkupProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/AbstractMarkupProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/MarkupParser.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/MarkupParser.java
index 67de298..09c70d6 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/MarkupParser.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/MarkupParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkup.g b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkup.g
index e1b571d..4da96a9 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkup.g
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkup.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkupLexer.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkupLexer.java
index e7fccae..8890d50 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkupLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkupLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkupParser.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkupParser.java
index 108278e..b05cbb2 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkupParser.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/contentassist/antlr/internal/InternalMarkupParser.java
@@ -23,9 +23,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/internal/MarkupActivator.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/internal/MarkupActivator.java
index ae96722..39b02ac 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/internal/MarkupActivator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src-gen/org/eclipse/ocl/xtext/markup/ui/internal/MarkupActivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/MarkupUiModule.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/MarkupUiModule.java
index bbd1194..41a4db1 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/MarkupUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/MarkupUiModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/contentassist/MarkupProposalProvider.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/contentassist/MarkupProposalProvider.java
index 5bbb689..2418fda 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/contentassist/MarkupProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/contentassist/MarkupProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupCompositeHover.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupCompositeHover.java
index 71c4566..87100e9 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupCompositeHover.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupCompositeHover.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupHover.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupHover.java
index 3fd4ef2..0848566 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupHover.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupHover.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupHoverProvider.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupHoverProvider.java
index bf5a0e8..37cea79 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupHoverProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/hover/MarkupHoverProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/labeling/MarkupDescriptionLabelProvider.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/labeling/MarkupDescriptionLabelProvider.java
index 3bf2a82..b5110fe 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/labeling/MarkupDescriptionLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/labeling/MarkupDescriptionLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/labeling/MarkupLabelProvider.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/labeling/MarkupLabelProvider.java
index c8e2b53..90aa4bc 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/labeling/MarkupLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/labeling/MarkupLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/outline/MarkupOutlineTreeProvider.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/outline/MarkupOutlineTreeProvider.java
index bd236db..e3b4489 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/outline/MarkupOutlineTreeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/outline/MarkupOutlineTreeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/quickfix/MarkupQuickfixProvider.java b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/quickfix/MarkupQuickfixProvider.java
index 857e9e4..e9ab7b9 100644
--- a/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/quickfix/MarkupQuickfixProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup.ui/src/org/eclipse/ocl/xtext/markup/ui/quickfix/MarkupQuickfixProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/about.html b/plugins/org.eclipse.ocl.xtext.markup/about.html
index 53123dc..0831d75 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/about.html
+++ b/plugins/org.eclipse.ocl.xtext.markup/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.xtext.markup/build.properties b/plugins/org.eclipse.ocl.xtext.markup/build.properties
index ea0ebd7..843de98 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.markup/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/BulletElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/BulletElement.java
index fc8d483..897b0f4 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/BulletElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/BulletElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/CompoundElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/CompoundElement.java
index 337315a..84f3d2c 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/CompoundElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/CompoundElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FigureElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FigureElement.java
index 494cea1..969ac39 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FigureElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FigureElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FigureRefElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FigureRefElement.java
index 271c1ce..e4f1a3a 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FigureRefElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FigureRefElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FontElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FontElement.java
index 2cdf266..71c2cfd 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FontElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FontElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FootnoteElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FootnoteElement.java
index 4664249..b0b0feb 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FootnoteElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/FootnoteElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/HeadingElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/HeadingElement.java
index d8143b3..e9a000a 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/HeadingElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/HeadingElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/Markup.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/Markup.java
index 6c2fff8..013be93 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/Markup.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/Markup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupElement.java
index eccac86..71cd56e 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupFactory.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupFactory.java
index 0c81ab2..d21fc29 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupPackage.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupPackage.java
index 6bfef4a..3ce9375 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupPackage.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/MarkupPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/NewLineElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/NewLineElement.java
index 8cee9dc..4bb88d2 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/NewLineElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/NewLineElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/NullElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/NullElement.java
index a215a74..ff6d760 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/NullElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/NullElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLCodeElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLCodeElement.java
index defc4fc..13b524f 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLCodeElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLCodeElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLEvalElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLEvalElement.java
index 85d39d4..25db987 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLEvalElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLEvalElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLTextElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLTextElement.java
index 26cd849..0c3d0ad 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLTextElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/OCLTextElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/TextElement.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/TextElement.java
index faa99f4..af5c0db 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/TextElement.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/TextElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/BulletElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/BulletElementImpl.java
index cb5b5e7..8372138 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/BulletElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/BulletElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/CompoundElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/CompoundElementImpl.java
index 8fd533d..38ae290 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/CompoundElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/CompoundElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FigureElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FigureElementImpl.java
index 85904c0..2818603 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FigureElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FigureElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FigureRefElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FigureRefElementImpl.java
index 188a8f4..ddac7cb 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FigureRefElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FigureRefElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FontElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FontElementImpl.java
index bc0b29c..661abbe 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FontElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FontElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FootnoteElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FootnoteElementImpl.java
index 9417f7e..d15847d 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FootnoteElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/FootnoteElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/HeadingElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/HeadingElementImpl.java
index cb61bd0..54c3fcd 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/HeadingElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/HeadingElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupElementImpl.java
index d8938a8..845aa72 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupFactoryImpl.java
index 275e7b7..9c19a99 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupImpl.java
index 7be13fd..7483843 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupPackageImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupPackageImpl.java
index 6bcef47..e1e5815 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupPackageImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/MarkupPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/NewLineElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/NewLineElementImpl.java
index 45f1db3..ce92fd4 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/NewLineElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/NewLineElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/NullElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/NullElementImpl.java
index 4d0ff75..19360ab 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/NullElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/NullElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLCodeElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLCodeElementImpl.java
index 2b73a93..8944fd9 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLCodeElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLCodeElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLEvalElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLEvalElementImpl.java
index 782e945..2911368 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLEvalElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLEvalElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLTextElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLTextElementImpl.java
index ce13a51..e2345b2 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLTextElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/OCLTextElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/TextElementImpl.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/TextElementImpl.java
index e6fd6fd..276b48b 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/TextElementImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/impl/TextElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/util/MarkupAdapterFactory.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/util/MarkupAdapterFactory.java
index 004571b..3e56199 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/util/MarkupAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/util/MarkupAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/util/MarkupSwitch.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/util/MarkupSwitch.java
index f075f01..b96e20f 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/util/MarkupSwitch.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/util/MarkupSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/BulletElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/BulletElementValidator.java
index 6f6cba8..c2ab4aa 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/BulletElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/BulletElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/CompoundElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/CompoundElementValidator.java
index 1b3e960..5a81ce1 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/CompoundElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/CompoundElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FigureElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FigureElementValidator.java
index 22dd35c..9a8e163 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FigureElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FigureElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FigureRefElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FigureRefElementValidator.java
index 7404634..00e90b6 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FigureRefElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FigureRefElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FontElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FontElementValidator.java
index 87e66e0..fdf018b 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FontElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FontElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FootnoteElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FootnoteElementValidator.java
index 86fb7f3..12cb6d1 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FootnoteElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/FootnoteElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/HeadingElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/HeadingElementValidator.java
index e8fb608..b226b24 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/HeadingElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/HeadingElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/MarkupElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/MarkupElementValidator.java
index 24968b1..9b4227e 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/MarkupElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/MarkupElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/MarkupValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/MarkupValidator.java
index 67e225b..46185a1 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/MarkupValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/MarkupValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/NewLineElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/NewLineElementValidator.java
index 59218ef..ef18f86 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/NewLineElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/NewLineElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/NullElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/NullElementValidator.java
index c0e5414..c0817ec 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/NullElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/NullElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLCodeElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLCodeElementValidator.java
index 56c6799..e2f71fe 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLCodeElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLCodeElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLEvalElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLEvalElementValidator.java
index 59937ff..2bad3d4 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLEvalElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLEvalElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLTextElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLTextElementValidator.java
index 2b97b28..59678f3 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLTextElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/OCLTextElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/TextElementValidator.java b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/TextElementValidator.java
index 307c1e6..5793fb1 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/TextElementValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/emf-gen/org/eclipse/ocl/xtext/markupcs/validation/TextElementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/model/Markup.genmodel b/plugins/org.eclipse.ocl.xtext.markup/model/Markup.genmodel
index ee6a78f..9f58de9 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/model/Markup.genmodel
+++ b/plugins/org.eclipse.ocl.xtext.markup/model/Markup.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.xtext.markup/emf-gen" editDirectory="/org.eclipse.ocl.xtext.markup.edit/src"
     editorDirectory="/org.eclipse.ocl.xtext.markup.editor/src" modelPluginID="org.eclipse.ocl.xtext.markup"
     forceOverwrite="true" modelName="MarkupCS" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
diff --git a/plugins/org.eclipse.ocl.xtext.markup/plugin.properties b/plugins/org.eclipse.ocl.xtext.markup/plugin.properties
index 3479c7d..f4f1f9f 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.markup/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/AbstractMarkupRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/AbstractMarkupRuntimeModule.java
index 4173a6e..d7f8ae5 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/AbstractMarkupRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/AbstractMarkupRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/MarkupGrammarResource.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/MarkupGrammarResource.java
index b65c597..7849fc4 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/MarkupGrammarResource.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/MarkupGrammarResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/MarkupStandaloneSetupGenerated.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/MarkupStandaloneSetupGenerated.java
index 3bc75de..5bdecf1 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/MarkupStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/MarkupStandaloneSetupGenerated.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/MarkupAntlrTokenFileProvider.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/MarkupAntlrTokenFileProvider.java
index f059a37..eed993d 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/MarkupAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/MarkupAntlrTokenFileProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/MarkupParser.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/MarkupParser.java
index 3aae1be..894a12b 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/MarkupParser.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/MarkupParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkup.g b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkup.g
index a13f816..8793627 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkup.g
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkup.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkupLexer.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkupLexer.java
index 0e31228..8189c16 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkupLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkupLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkupParser.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkupParser.java
index 1b70a67..a3d945d 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkupParser.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/parser/antlr/internal/InternalMarkupParser.java
@@ -22,9 +22,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/serializer/AbstractMarkupSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/serializer/AbstractMarkupSemanticSequencer.java
index 9144a61..c23164c 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/serializer/AbstractMarkupSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/serializer/AbstractMarkupSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/serializer/AbstractMarkupSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/serializer/AbstractMarkupSyntacticSequencer.java
index cebebbd..6ea6c6f 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/serializer/AbstractMarkupSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/serializer/AbstractMarkupSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/services/MarkupGrammarAccess.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/services/MarkupGrammarAccess.java
index 60625f5..a19cc8c 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/services/MarkupGrammarAccess.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/services/MarkupGrammarAccess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/validation/AbstractMarkupJavaValidator.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/validation/AbstractMarkupJavaValidator.java
index 8453961..305ba74 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/validation/AbstractMarkupJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/validation/AbstractMarkupJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/Markup.xtext b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/Markup.xtext
index 7aed915..0d56f25 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/Markup.xtext
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/Markup.xtext
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupRuntimeModule.java
index a5be795..f204cae 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupStandaloneSetup.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupStandaloneSetup.java
index 60079d3..8bd52e7 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupStandaloneSetup.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToHTML.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToHTML.java
index 4227c82..97f44b5 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToHTML.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToHTML.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToString.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToString.java
index 64d28e2..bb37cf1 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToString.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToString.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToTree.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToTree.java
index 54ee12c..48d24aa 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToTree.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupToTree.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupUtils.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupUtils.java
index ca01eab..5d9486f 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupUtils.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/MarkupUtils.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/formatting/MarkupFormatter.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/formatting/MarkupFormatter.java
index 9b062ab..7724416 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/formatting/MarkupFormatter.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/formatting/MarkupFormatter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/scoping/MarkupScopeProvider.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/scoping/MarkupScopeProvider.java
index 5be493d..4eea8a0 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/scoping/MarkupScopeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/scoping/MarkupScopeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/serializer/MarkupSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/serializer/MarkupSemanticSequencer.java
index cc3667d..e73e866 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/serializer/MarkupSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/serializer/MarkupSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/serializer/MarkupSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/serializer/MarkupSyntacticSequencer.java
index 8629204..087e75e 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/serializer/MarkupSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/serializer/MarkupSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/services/MarkupValueConverterService.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/services/MarkupValueConverterService.java
index e889ac1..6327e33 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/services/MarkupValueConverterService.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/services/MarkupValueConverterService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/validation/MarkupJavaValidator.java b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/validation/MarkupJavaValidator.java
index da07658..6207e51 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/validation/MarkupJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src/org/eclipse/ocl/xtext/markup/validation/MarkupJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/about.html b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/about.html
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/build.properties b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/build.properties
index 31b14b6..9696c07 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/plugin.properties b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/plugin.properties
index a85c6de..8ba1a8a 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/AbstractOCLinEcoreUiModule.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/AbstractOCLinEcoreUiModule.java
index de64543..abad2e7 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/AbstractOCLinEcoreUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/AbstractOCLinEcoreUiModule.java
@@ -2,9 +2,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreExecutableExtensionFactory.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreExecutableExtensionFactory.java
index d33172f..35d20ab 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreExecutableExtensionFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreExecutableExtensionFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/AbstractOCLinEcoreProposalProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/AbstractOCLinEcoreProposalProvider.java
index f657cdc..a3e6a16 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/AbstractOCLinEcoreProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/AbstractOCLinEcoreProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/OCLinEcoreParser.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/OCLinEcoreParser.java
index e907719..6728f8a 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/OCLinEcoreParser.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/OCLinEcoreParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcore.g b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcore.g
index 3c249bf..c4c7b67 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcore.g
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcore.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcoreLexer.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcoreLexer.java
index 63f6d43..eef6f8e 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcoreLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcoreLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcoreParser.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcoreParser.java
index 02db3dc..06a09da 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcoreParser.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/antlr/internal/InternalOCLinEcoreParser.java
@@ -23,9 +23,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/internal/OCLinEcoreActivator.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/internal/OCLinEcoreActivator.java
index 442f397..65a34d1 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/internal/OCLinEcoreActivator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src-gen/org/eclipse/ocl/xtext/oclinecore/ui/internal/OCLinEcoreActivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreEditor.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreEditor.java
index 370f360..d421489 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreEditor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreEditor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreEditorCallback.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreEditorCallback.java
index 4d940e0..59e24dc 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreEditorCallback.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreEditorCallback.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreResourceForEditorInputFactory.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreResourceForEditorInputFactory.java
index 0773df5..8a25186 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreResourceForEditorInputFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreResourceForEditorInputFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreUiModule.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreUiModule.java
index 0fe9132..09fa40f 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreUiModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreUiPluginHelper.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreUiPluginHelper.java
index 266ce9c..f8c525a 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreUiPluginHelper.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/OCLinEcoreUiPluginHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/AbstractSaveAsHandler.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/AbstractSaveAsHandler.java
index aa52059..7bfc46b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/AbstractSaveAsHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/AbstractSaveAsHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/CreateDynamicInstanceHandler.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/CreateDynamicInstanceHandler.java
index 51a5af7..8cc0ca1 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/CreateDynamicInstanceHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/CreateDynamicInstanceHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsEcoreHandler.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsEcoreHandler.java
index 33c802f..df51a2a 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsEcoreHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsEcoreHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsOCLinEcoreHandler.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsOCLinEcoreHandler.java
index a4b119b..3b49bed 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsOCLinEcoreHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsOCLinEcoreHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsPivotHandler.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsPivotHandler.java
index 64f7027..188d2f9 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsPivotHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsPivotHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsUMLHandler.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsUMLHandler.java
index 3dd5c85..7bdb554 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsUMLHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveAsUMLHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveInEcoreHandler.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveInEcoreHandler.java
index 8f3a618..fd95156 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveInEcoreHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SaveInEcoreHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SetExportDelegateURIHandler.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SetExportDelegateURIHandler.java
index f91d3f5..10d9cc9 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SetExportDelegateURIHandler.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/commands/SetExportDelegateURIHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/OCLinEcoreProposalProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/OCLinEcoreProposalProvider.java
index 15fcf75..19e15ca 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/OCLinEcoreProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/contentassist/OCLinEcoreProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/labeling/OCLinEcoreDescriptionLabelProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/labeling/OCLinEcoreDescriptionLabelProvider.java
index 951a2f8..608cde5 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/labeling/OCLinEcoreDescriptionLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/labeling/OCLinEcoreDescriptionLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/labeling/OCLinEcoreLabelProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/labeling/OCLinEcoreLabelProvider.java
index 500489c..94d164b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/labeling/OCLinEcoreLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/labeling/OCLinEcoreLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/messages/OCLinEcoreUIMessages.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/messages/OCLinEcoreUIMessages.java
index c2bdaa1..dc88780 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/messages/OCLinEcoreUIMessages.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/messages/OCLinEcoreUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/messages/OCLinEcoreUIMessages.properties b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/messages/OCLinEcoreUIMessages.properties
index 07258af..1539765 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/messages/OCLinEcoreUIMessages.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/messages/OCLinEcoreUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/model/OCLinEcoreDocument.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/model/OCLinEcoreDocument.java
index fc50ab9..bfe7bed 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/model/OCLinEcoreDocument.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/model/OCLinEcoreDocument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/model/OCLinEcoreDocumentProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/model/OCLinEcoreDocumentProvider.java
index ffb76e6..a4d24e9 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/model/OCLinEcoreDocumentProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/model/OCLinEcoreDocumentProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/outline/OCLinEcoreOutlineTreeProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/outline/OCLinEcoreOutlineTreeProvider.java
index 9713107..a7b60ec 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/outline/OCLinEcoreOutlineTreeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/outline/OCLinEcoreOutlineTreeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/preferences/OCLinEcoreProjectPreferencePage.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/preferences/OCLinEcoreProjectPreferencePage.java
index 7aab60e..e5cb1b8 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/preferences/OCLinEcoreProjectPreferencePage.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/preferences/OCLinEcoreProjectPreferencePage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/quickfix/OCLinEcoreQuickfixProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/quickfix/OCLinEcoreQuickfixProvider.java
index 7321995..787286b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/quickfix/OCLinEcoreQuickfixProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/quickfix/OCLinEcoreQuickfixProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/AbstractOCLinEcoreFileNewWizard.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/AbstractOCLinEcoreFileNewWizard.java
index 39614df..5874cf9 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/AbstractOCLinEcoreFileNewWizard.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/AbstractOCLinEcoreFileNewWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/EcoreWithOCLFileDialog.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/EcoreWithOCLFileDialog.java
index 0e1b278..6a9d0a4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/EcoreWithOCLFileDialog.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/EcoreWithOCLFileDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/EcoreWithOCLFileNewWizard.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/EcoreWithOCLFileNewWizard.java
index 25e15347..724f4e4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/EcoreWithOCLFileNewWizard.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/EcoreWithOCLFileNewWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/OCLinEcoreFileDialog.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/OCLinEcoreFileDialog.java
index 8e7ffbc..4e85a74 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/OCLinEcoreFileDialog.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/OCLinEcoreFileDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/OCLinEcoreFileNewWizard.java b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/OCLinEcoreFileNewWizard.java
index b3b2ffd..c25c16b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/OCLinEcoreFileNewWizard.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/src/org/eclipse/ocl/xtext/oclinecore/ui/wizards/OCLinEcoreFileNewWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/about.html b/plugins/org.eclipse.ocl.xtext.oclinecore/about.html
index 2f46c17..d75d996 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/about.html
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/build.properties b/plugins/org.eclipse.ocl.xtext.oclinecore/build.properties
index 8b70755..a0325a0 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreCSFactory.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreCSFactory.java
index 5cef2f7..70d1ac1 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreCSFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreCSFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreCSPackage.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreCSPackage.java
index c375f46..6d50d9e 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreCSPackage.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreCSPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreConstraintCS.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreConstraintCS.java
index 1f65ca2..0f203b6 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreConstraintCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/OCLinEcoreConstraintCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/SysMLCS.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/SysMLCS.java
index a01871d..077d36b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/SysMLCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/SysMLCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/TopLevelCS.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/TopLevelCS.java
index fd19b86..4ed34f7 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/TopLevelCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/TopLevelCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreCSFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreCSFactoryImpl.java
index 832f350..fb2c60e 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreCSFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreCSFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreCSPackageImpl.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreCSPackageImpl.java
index a85a345..331588c 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreCSPackageImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreCSPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreConstraintCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreConstraintCSImpl.java
index 1eade02..fe8e66d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreConstraintCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/OCLinEcoreConstraintCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/SysMLCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/SysMLCSImpl.java
index 3a69d7d..63b4706 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/SysMLCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/SysMLCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/TopLevelCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/TopLevelCSImpl.java
index 51164b5..fd95f0b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/TopLevelCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/impl/TopLevelCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractDelegatingOCLinEcoreCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractDelegatingOCLinEcoreCSVisitor.java
index 09e8818..40ebc64 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractDelegatingOCLinEcoreCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractDelegatingOCLinEcoreCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractExtendingOCLinEcoreCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractExtendingOCLinEcoreCSVisitor.java
index 9b9597a..3baeeb6 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractExtendingOCLinEcoreCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractExtendingOCLinEcoreCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractNullOCLinEcoreCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractNullOCLinEcoreCSVisitor.java
index 668b875..a8ab5af 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractNullOCLinEcoreCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractNullOCLinEcoreCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSContainmentVisitor.java
index 8e8df05..64e7ede 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSLeft2RightVisitor.java
index ed59cd5..0ba06c8 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSPostOrderVisitor.java
index 19a5827..f2fabb6 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSPreOrderVisitor.java
index ed20491..1fb4468 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSVisitor.java
index b01a4e7..7a4dfcb 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/AbstractOCLinEcoreCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/DecorableOCLinEcoreCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/DecorableOCLinEcoreCSVisitor.java
index e8b24fe..184f3de 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/DecorableOCLinEcoreCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/DecorableOCLinEcoreCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSAdapterFactory.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSAdapterFactory.java
index eb8e2eb..3c66bda 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSSwitch.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSSwitch.java
index 43c53e6..95eee10 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSSwitch.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSVisitor.java
index d4ee092..199fce5 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/emf-gen/org/eclipse/ocl/xtext/oclinecorecs/util/OCLinEcoreCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/model/OCLinEcoreCS.genmodel b/plugins/org.eclipse.ocl.xtext.oclinecore/model/OCLinEcoreCS.genmodel
index a6eb40d..e8480c7 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/model/OCLinEcoreCS.genmodel
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/model/OCLinEcoreCS.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.xtext.oclinecore/emf-gen" editDirectory="/org.eclipse.ocl.xtext.oclinecore.edit/emf-gen"
     editorDirectory="/org.eclipse.ocl.xtext.oclinecore.editor/emf-gen" modelPluginID="org.eclipse.ocl.xtext.oclinecore"
     forceOverwrite="true" modelName="OCLinEcoreCS" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/plugin.properties b/plugins/org.eclipse.ocl.xtext.oclinecore/plugin.properties
index 1805433..3fed845 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/AbstractOCLinEcoreRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/AbstractOCLinEcoreRuntimeModule.java
index 83b1331..732fc26 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/AbstractOCLinEcoreRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/AbstractOCLinEcoreRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreGrammarResource.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreGrammarResource.java
index 09e8118..9005726 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreGrammarResource.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreGrammarResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreStandaloneSetupGenerated.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreStandaloneSetupGenerated.java
index 661b691..6b39d8d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreStandaloneSetupGenerated.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/OCLinEcoreAntlrTokenFileProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/OCLinEcoreAntlrTokenFileProvider.java
index 00a2b97..440cbc2 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/OCLinEcoreAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/OCLinEcoreAntlrTokenFileProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/OCLinEcoreParser.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/OCLinEcoreParser.java
index 53e7628..e8daf25 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/OCLinEcoreParser.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/OCLinEcoreParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcore.g b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcore.g
index 13c8baa..cf93933 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcore.g
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcore.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcoreLexer.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcoreLexer.java
index 623edbb..7ad30e3 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcoreLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcoreLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcoreParser.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcoreParser.java
index ae171e9..53850d6 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcoreParser.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/parser/antlr/internal/InternalOCLinEcoreParser.java
@@ -22,9 +22,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/serializer/AbstractOCLinEcoreSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/serializer/AbstractOCLinEcoreSemanticSequencer.java
index dda8540..bc771d7 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/serializer/AbstractOCLinEcoreSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/serializer/AbstractOCLinEcoreSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/serializer/AbstractOCLinEcoreSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/serializer/AbstractOCLinEcoreSyntacticSequencer.java
index 806d99d..8252684 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/serializer/AbstractOCLinEcoreSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/serializer/AbstractOCLinEcoreSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/services/OCLinEcoreGrammarAccess.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/services/OCLinEcoreGrammarAccess.java
index ab799c6..f2ce8dc 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/services/OCLinEcoreGrammarAccess.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/services/OCLinEcoreGrammarAccess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/validation/AbstractOCLinEcoreJavaValidator.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/validation/AbstractOCLinEcoreJavaValidator.java
index fccde55..0450cb0 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/validation/AbstractOCLinEcoreJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/validation/AbstractOCLinEcoreJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcore.properties b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcore.properties
index 4b6ec63..5cd45eb 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcore.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcore.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcore.xtext b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcore.xtext
index 9398986..efea271 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcore.xtext
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcore.xtext
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreRuntimeModule.java
index 1ad0ed9..2f0524c 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreStandaloneSetup.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreStandaloneSetup.java
index 9c31981..24f437c 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreStandaloneSetup.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/OCLinEcoreStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/as2cs/OCLinEcoreAS2CS.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/as2cs/OCLinEcoreAS2CS.java
index ac11d70..5d56f7e 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/as2cs/OCLinEcoreAS2CS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/as2cs/OCLinEcoreAS2CS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/as2cs/OCLinEcoreDeclarationVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/as2cs/OCLinEcoreDeclarationVisitor.java
index 51cc324..7636aab 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/as2cs/OCLinEcoreDeclarationVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/as2cs/OCLinEcoreDeclarationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCS2AS.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCS2AS.java
index 07e3864..98bcab4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCS2AS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCS2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSContainmentVisitor.java
index d2b154c..15809fa 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSLeft2RightVisitor.java
index 70968a6..0b2894d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSPostOrderVisitor.java
index 3c38256..a794ad9 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSPreOrderVisitor.java
index 445dffd..5e335f4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/cs2as/OCLinEcoreCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/formatting/OCLinEcoreFormatter.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/formatting/OCLinEcoreFormatter.java
index 08fc5c0..91ccaa1 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/formatting/OCLinEcoreFormatter.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/formatting/OCLinEcoreFormatter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/scoping/OCLinEcoreScopeProvider.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/scoping/OCLinEcoreScopeProvider.java
index 9e78b3c..65ddac3 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/scoping/OCLinEcoreScopeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/scoping/OCLinEcoreScopeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/serializer/OCLinEcoreSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/serializer/OCLinEcoreSemanticSequencer.java
index a0d63ae..4d8200d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/serializer/OCLinEcoreSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/serializer/OCLinEcoreSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/serializer/OCLinEcoreSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/serializer/OCLinEcoreSyntacticSequencer.java
index a1c562b..46b73b0 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/serializer/OCLinEcoreSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/serializer/OCLinEcoreSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/services/OCLinEcoreValueConverterService.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/services/OCLinEcoreValueConverterService.java
index 3e3b9bb..d8dddd5 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/services/OCLinEcoreValueConverterService.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/services/OCLinEcoreValueConverterService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreASResourceFactory.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreASResourceFactory.java
index d43ed9e..0771d30 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreASResourceImpl.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreASResourceImpl.java
index a90aa81..1869507 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreASResourceImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreASResourceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreCSResource.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreCSResource.java
index 9bfc1f0..8d87907 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreCSResource.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcoreCSResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcorePlugin.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcorePlugin.java
index a917718..f1483d0 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcorePlugin.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/utilities/OCLinEcorePlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/validation/OCLinEcoreEObjectValidator.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/validation/OCLinEcoreEObjectValidator.java
index 82430fe..c975c7a 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/validation/OCLinEcoreEObjectValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/validation/OCLinEcoreEObjectValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/validation/OCLinEcoreJavaValidator.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/validation/OCLinEcoreJavaValidator.java
index b90ff77..0c4a220 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/validation/OCLinEcoreJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src/org/eclipse/ocl/xtext/oclinecore/validation/OCLinEcoreJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/about.html b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/about.html
index c0be2e9..e9d1dac 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/about.html
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/build.properties b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/build.properties
index a8f5584..c7e9f7c 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/plugin.properties b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/plugin.properties
index 875af86..2f9545a 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/AbstractOCLstdlibUiModule.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/AbstractOCLstdlibUiModule.java
index 517525d..cadfeb5 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/AbstractOCLstdlibUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/AbstractOCLstdlibUiModule.java
@@ -2,9 +2,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibExecutableExtensionFactory.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibExecutableExtensionFactory.java
index 5ce79f4..86cedf6 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibExecutableExtensionFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibExecutableExtensionFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/AbstractOCLstdlibProposalProvider.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/AbstractOCLstdlibProposalProvider.java
index 14856e4..f6a1f28 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/AbstractOCLstdlibProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/AbstractOCLstdlibProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/OCLstdlibParser.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/OCLstdlibParser.java
index bac6564..ee319bf 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/OCLstdlibParser.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/OCLstdlibParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlib.g b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlib.g
index 5407fc0..6498c27 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlib.g
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlib.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlibLexer.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlibLexer.java
index ee25c57..cb49eca 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlibLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlibLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlibParser.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlibParser.java
index cb25b55..2157167 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlibParser.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/antlr/internal/InternalOCLstdlibParser.java
@@ -23,9 +23,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/internal/OCLstdlibActivator.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/internal/OCLstdlibActivator.java
index 8ed4e0b..df88c08 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/internal/OCLstdlibActivator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src-gen/org/eclipse/ocl/xtext/oclstdlib/ui/internal/OCLstdlibActivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibEditor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibEditor.java
index 8ca45b7..401538b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibEditor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibEditor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibJavaClassPathResourceForIEditorInputFactory.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibJavaClassPathResourceForIEditorInputFactory.java
index fc4baea..3299a8f 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibJavaClassPathResourceForIEditorInputFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibJavaClassPathResourceForIEditorInputFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibUiModule.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibUiModule.java
index e924fad..45456ef 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibUiModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/OCLstdlibUiModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/OCLstdlibProposalProvider.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/OCLstdlibProposalProvider.java
index 9c1afa8..9b3c2a8 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/OCLstdlibProposalProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/contentassist/OCLstdlibProposalProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/labeling/OCLstdlibDescriptionLabelProvider.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/labeling/OCLstdlibDescriptionLabelProvider.java
index 7ddb98e..df06bfc 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/labeling/OCLstdlibDescriptionLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/labeling/OCLstdlibDescriptionLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/labeling/OCLstdlibLabelProvider.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/labeling/OCLstdlibLabelProvider.java
index c06b11c..9221d18 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/labeling/OCLstdlibLabelProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/labeling/OCLstdlibLabelProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/messages/OCLstdlibUIMessages.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/messages/OCLstdlibUIMessages.java
index 30ea38d..73ac17d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/messages/OCLstdlibUIMessages.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/messages/OCLstdlibUIMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/messages/OCLstdlibUIMessages.properties b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/messages/OCLstdlibUIMessages.properties
index fe2bd55..9bba252 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/messages/OCLstdlibUIMessages.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/messages/OCLstdlibUIMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 # 
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/outline/OCLstdlibOutlineTreeProvider.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/outline/OCLstdlibOutlineTreeProvider.java
index b2b4af3..39cf84f 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/outline/OCLstdlibOutlineTreeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/outline/OCLstdlibOutlineTreeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/quickfix/OCLstdlibQuickfixProvider.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/quickfix/OCLstdlibQuickfixProvider.java
index 613e11e..cf15e10 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/quickfix/OCLstdlibQuickfixProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/quickfix/OCLstdlibQuickfixProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/refactoring/OCLstdlibReferenceUpdater.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/refactoring/OCLstdlibReferenceUpdater.java
index d83243d..ec9e90b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/refactoring/OCLstdlibReferenceUpdater.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/refactoring/OCLstdlibReferenceUpdater.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/refactoring/OCLstdlibRenameStrategy.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/refactoring/OCLstdlibRenameStrategy.java
index ed4bea7..8c5a644 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/refactoring/OCLstdlibRenameStrategy.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/refactoring/OCLstdlibRenameStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/wizards/OCLstdlibFileDialog.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/wizards/OCLstdlibFileDialog.java
index 5df7bcf..5832c6a 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/wizards/OCLstdlibFileDialog.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/wizards/OCLstdlibFileDialog.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/wizards/OCLstdlibFileNewWizard.java b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/wizards/OCLstdlibFileNewWizard.java
index e7f54db..c7c7e54 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/wizards/OCLstdlibFileNewWizard.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/src/org/eclipse/ocl/xtext/oclstdlib/ui/wizards/OCLstdlibFileNewWizard.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/about.html b/plugins/org.eclipse.ocl.xtext.oclstdlib/about.html
index c0be2e9..e9d1dac 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/about.html
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl.xtext.oclstdlib/build.properties b/plugins/org.eclipse.ocl.xtext.oclstdlib/build.properties
index 8b70755..a0325a0 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/build.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/JavaClassCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/JavaClassCS.java
index 9dca5c8..7f86bc3 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/JavaClassCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/JavaClassCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/JavaImplementationCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/JavaImplementationCS.java
index 1a65d6a..20c15f6 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/JavaImplementationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/JavaImplementationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibClassCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibClassCS.java
index 6150299..c1968ab 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibClassCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibClassCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibCoercionCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibCoercionCS.java
index addbd2e..9c9219e 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibCoercionCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibCoercionCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibConstraintCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibConstraintCS.java
index ece64cd..f92471d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibConstraintCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibConstraintCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibIterationCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibIterationCS.java
index 44dd84d..762da76 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibIterationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibIterationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibOperationCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibOperationCS.java
index 5b80b97..987b898 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibOperationCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibOperationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibPackageCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibPackageCS.java
index 0cbb6b5..693f43a 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibPackageCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibPackageCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibPropertyCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibPropertyCS.java
index d37f664..ca41dc1 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibPropertyCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibPropertyCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibRootPackageCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibRootPackageCS.java
index 6e395c6..1bd8682 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibRootPackageCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/LibRootPackageCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/MetaclassNameCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/MetaclassNameCS.java
index 3894b4a..ef18c3d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/MetaclassNameCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/MetaclassNameCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/OCLstdlibCSFactory.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/OCLstdlibCSFactory.java
index 8ccd264..ced32ff 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/OCLstdlibCSFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/OCLstdlibCSFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/OCLstdlibCSPackage.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/OCLstdlibCSPackage.java
index daddc84..c553fd3 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/OCLstdlibCSPackage.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/OCLstdlibCSPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/PrecedenceCS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/PrecedenceCS.java
index 548731e..9da8ea4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/PrecedenceCS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/PrecedenceCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/JavaClassCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/JavaClassCSImpl.java
index 94071b4..aec6582 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/JavaClassCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/JavaClassCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/JavaImplementationCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/JavaImplementationCSImpl.java
index c56679a..c60d7a1 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/JavaImplementationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/JavaImplementationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibClassCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibClassCSImpl.java
index f24a0d0..e4fb2b6 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibClassCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibClassCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibCoercionCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibCoercionCSImpl.java
index 8ad21bf..2bd0a55 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibCoercionCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibCoercionCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibConstraintCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibConstraintCSImpl.java
index fd9a881..4ca14b0 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibConstraintCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibConstraintCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibIterationCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibIterationCSImpl.java
index 51e7700..5e17793 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibIterationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibIterationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibOperationCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibOperationCSImpl.java
index c9d2b01..3fc0eb4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibOperationCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibOperationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibPackageCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibPackageCSImpl.java
index 313b9c8..b48f22d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibPackageCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibPackageCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibPropertyCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibPropertyCSImpl.java
index 04a1e6a..2b1a7de 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibPropertyCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibPropertyCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibRootPackageCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibRootPackageCSImpl.java
index 4e7bacc..a281829 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibRootPackageCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/LibRootPackageCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/MetaclassNameCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/MetaclassNameCSImpl.java
index 8510247..db2b382 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/MetaclassNameCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/MetaclassNameCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/OCLstdlibCSFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/OCLstdlibCSFactoryImpl.java
index 7372a59..9759751 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/OCLstdlibCSFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/OCLstdlibCSFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/OCLstdlibCSPackageImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/OCLstdlibCSPackageImpl.java
index feb8d57..e5bd3af 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/OCLstdlibCSPackageImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/OCLstdlibCSPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/PrecedenceCSImpl.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/PrecedenceCSImpl.java
index efdd6ee..abce524 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/PrecedenceCSImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/impl/PrecedenceCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractDelegatingOCLstdlibCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractDelegatingOCLstdlibCSVisitor.java
index 1068c55..ed1ee92 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractDelegatingOCLstdlibCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractDelegatingOCLstdlibCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractExtendingOCLstdlibCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractExtendingOCLstdlibCSVisitor.java
index 8d6ca67..2a4d9f4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractExtendingOCLstdlibCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractExtendingOCLstdlibCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractNullOCLstdlibCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractNullOCLstdlibCSVisitor.java
index e88e379..f6e93a9 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractNullOCLstdlibCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractNullOCLstdlibCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSContainmentVisitor.java
index 7a0ad13..cf10b78 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSLeft2RightVisitor.java
index 0dd1908..841d66f 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSPostOrderVisitor.java
index 0c1c83f..6f8d203 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSPreOrderVisitor.java
index c4d586a..c915c6d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSVisitor.java
index c781aed..fd0c760 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/AbstractOCLstdlibCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/DecorableOCLstdlibCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/DecorableOCLstdlibCSVisitor.java
index b200230..39ff32f 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/DecorableOCLstdlibCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/DecorableOCLstdlibCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSAdapterFactory.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSAdapterFactory.java
index b7da3f1..13a6163 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSAdapterFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSSwitch.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSSwitch.java
index 234db7b..de07bda 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSSwitch.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSValidator.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSValidator.java
index 3f672fc..8d9b332 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSVisitor.java
index 309a237..3647958 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/emf-gen/org/eclipse/ocl/xtext/oclstdlibcs/util/OCLstdlibCSVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/model/OCLstdlibCS.genmodel b/plugins/org.eclipse.ocl.xtext.oclstdlib/model/OCLstdlibCS.genmodel
index f69aabd..05d65aa 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/model/OCLstdlibCS.genmodel
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/model/OCLstdlibCS.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) 2010, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation"
     modelDirectory="/org.eclipse.ocl.xtext.oclstdlib/emf-gen" editDirectory="/org.eclipse.ocl.xtext.oclstdlib.edit/emf-gen"
     editorDirectory="/org.eclipse.ocl.xtext.oclstdlib.editor/emf-gen" modelPluginID="org.eclipse.ocl.xtext.oclstdlib"
     forceOverwrite="true" modelName="OCLstdlibCS" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/plugin.properties b/plugins/org.eclipse.ocl.xtext.oclstdlib/plugin.properties
index 553ab95..00a15bb 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/plugin.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/AbstractOCLstdlibRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/AbstractOCLstdlibRuntimeModule.java
index 5531cb4..91e8fbe 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/AbstractOCLstdlibRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/AbstractOCLstdlibRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibGrammarResource.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibGrammarResource.java
index a57e9fc..02b6c70 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibGrammarResource.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibGrammarResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibStandaloneSetupGenerated.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibStandaloneSetupGenerated.java
index 0730b02..7e6482f 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibStandaloneSetupGenerated.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibStandaloneSetupGenerated.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/OCLstdlibAntlrTokenFileProvider.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/OCLstdlibAntlrTokenFileProvider.java
index b933bcd..6734920 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/OCLstdlibAntlrTokenFileProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/OCLstdlibAntlrTokenFileProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/OCLstdlibParser.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/OCLstdlibParser.java
index d7f1522..9bbb2ea 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/OCLstdlibParser.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/OCLstdlibParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlib.g b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlib.g
index 1b7a2a1..6802c9c 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlib.g
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlib.g
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlibLexer.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlibLexer.java
index f71704b..c4a5ec3 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlibLexer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlibLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlibParser.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlibParser.java
index 3693f6b..bfc195b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlibParser.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/parser/antlr/internal/InternalOCLstdlibParser.java
@@ -22,9 +22,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/serializer/AbstractOCLstdlibSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/serializer/AbstractOCLstdlibSemanticSequencer.java
index e3d54d8..63c5068 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/serializer/AbstractOCLstdlibSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/serializer/AbstractOCLstdlibSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/serializer/AbstractOCLstdlibSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/serializer/AbstractOCLstdlibSyntacticSequencer.java
index 9591768..1c1eca4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/serializer/AbstractOCLstdlibSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/serializer/AbstractOCLstdlibSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/services/OCLstdlibGrammarAccess.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/services/OCLstdlibGrammarAccess.java
index ab3ad79..759c8c2 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/services/OCLstdlibGrammarAccess.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/services/OCLstdlibGrammarAccess.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/validation/AbstractOCLstdlibJavaValidator.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/validation/AbstractOCLstdlibJavaValidator.java
index f018799..2d67015 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/validation/AbstractOCLstdlibJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/validation/AbstractOCLstdlibJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlib.properties b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlib.properties
index cf33162..f9b2e94 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlib.properties
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlib.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlib.xtext b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlib.xtext
index 6f54a2d..faf66e4 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlib.xtext
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlib.xtext
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibRuntimeModule.java
index b18afc8..5d830dd 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibRuntimeModule.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibStandaloneSetup.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibStandaloneSetup.java
index f9def4a..5c71847 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibStandaloneSetup.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/OCLstdlibStandaloneSetup.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCS2AS.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCS2AS.java
index 4860153..7ce91ec 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCS2AS.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCS2AS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSContainmentVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSContainmentVisitor.java
index 55a256d..8641f8d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSContainmentVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSContainmentVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSLeft2RightVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSLeft2RightVisitor.java
index 0aedf12..05a6a06 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSLeft2RightVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSLeft2RightVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSPostOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSPostOrderVisitor.java
index d8d54ad..7100960 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSPostOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSPostOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSPreOrderVisitor.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSPreOrderVisitor.java
index 7adafaa..b960e1b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSPreOrderVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/cs2as/OCLstdlibCSPreOrderVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/formatting/OCLstdlibFormatter.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/formatting/OCLstdlibFormatter.java
index abfc8da..b21e278 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/formatting/OCLstdlibFormatter.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/formatting/OCLstdlibFormatter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/scoping/JavaClassScope.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/scoping/JavaClassScope.java
index 100275a..0817686 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/scoping/JavaClassScope.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/scoping/JavaClassScope.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/scoping/OCLstdlibScopeProvider.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/scoping/OCLstdlibScopeProvider.java
index cdc7a99..bfd8411 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/scoping/OCLstdlibScopeProvider.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/scoping/OCLstdlibScopeProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/serializer/OCLstdlibSemanticSequencer.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/serializer/OCLstdlibSemanticSequencer.java
index 4a1b853..13da5b8 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/serializer/OCLstdlibSemanticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/serializer/OCLstdlibSemanticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/serializer/OCLstdlibSyntacticSequencer.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/serializer/OCLstdlibSyntacticSequencer.java
index 3e9b3eb..458e522 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/serializer/OCLstdlibSyntacticSequencer.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/serializer/OCLstdlibSyntacticSequencer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/services/OCLstdlibValueConverterService.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/services/OCLstdlibValueConverterService.java
index f9f184e..4c50e7b 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/services/OCLstdlibValueConverterService.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/services/OCLstdlibValueConverterService.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibASResourceFactory.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibASResourceFactory.java
index 7a6b947..65ff579 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibASResourceFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibASResourceFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibCSResource.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibCSResource.java
index 7e04c5b..db2d87c 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibCSResource.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibCSResource.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibPlugin.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibPlugin.java
index b3213c6..d30c917 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibPlugin.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/utilities/OCLstdlibPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/validation/OCLstdlibCompositeEValidator.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/validation/OCLstdlibCompositeEValidator.java
index 3745189..d07ba6c 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/validation/OCLstdlibCompositeEValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/validation/OCLstdlibCompositeEValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/validation/OCLstdlibJavaValidator.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/validation/OCLstdlibJavaValidator.java
index a5f94ed..08a9f0d 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/validation/OCLstdlibJavaValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src/org/eclipse/ocl/xtext/oclstdlib/validation/OCLstdlibJavaValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/about.html b/plugins/org.eclipse.ocl/about.html
index c30485d..365e165 100644
--- a/plugins/org.eclipse.ocl/about.html
+++ b/plugins/org.eclipse.ocl/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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/plugins/org.eclipse.ocl/about.properties b/plugins/org.eclipse.ocl/about.properties
index db713bc..8347795 100644
--- a/plugins/org.eclipse.ocl/about.properties
+++ b/plugins/org.eclipse.ocl/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/build.properties b/plugins/org.eclipse.ocl/build.properties
index 07baed4..ad14e59 100644
--- a/plugins/org.eclipse.ocl/build.properties
+++ b/plugins/org.eclipse.ocl/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/model/OCL.properties b/plugins/org.eclipse.ocl/model/OCL.properties
index f9dc3cc..1f5a502 100644
--- a/plugins/org.eclipse.ocl/model/OCL.properties
+++ b/plugins/org.eclipse.ocl/model/OCL.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/model/OCLCST.properties b/plugins/org.eclipse.ocl/model/OCLCST.properties
index 5034104..888802b 100644
--- a/plugins/org.eclipse.ocl/model/OCLCST.properties
+++ b/plugins/org.eclipse.ocl/model/OCLCST.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/plugin.properties b/plugins/org.eclipse.ocl/plugin.properties
index 545e181..feaf1cb 100644
--- a/plugins/org.eclipse.ocl/plugin.properties
+++ b/plugins/org.eclipse.ocl/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/plugin.xml b/plugins/org.eclipse.ocl/plugin.xml
index ef68661..441965f 100644
--- a/plugins/org.eclipse.ocl/plugin.xml
+++ b/plugins/org.eclipse.ocl/plugin.xml
@@ -4,9 +4,9 @@
 <!--
  Copyright (c) 2005, 2008 IBM Corporation, Zeligsoft Inc., 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 v2.0
  which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
 
  Contributors:
    IBM - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/schema/environments.exsd b/plugins/org.eclipse.ocl/schema/environments.exsd
index 2d5623d..670820f 100644
--- a/plugins/org.eclipse.ocl/schema/environments.exsd
+++ b/plugins/org.eclipse.ocl/schema/environments.exsd
@@ -146,9 +146,9 @@
       <documentation>
          Copyright (c) 2007  IBM Corporation and others.&lt;br&gt;
  All rights reserved. This program and the accompanying materials 
- are made available under the terms of the Eclipse Public License v1.0 
+ are made available under the terms of the Eclipse Public License v2.0 
  which accompanies this distribution, and is available at 
- &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+ &lt;a href=&quot;http://www.eclipse.org/legal/epl-v20.html&quot;&gt;http://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java
index 743f541..1de984f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironmentFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironmentFactory.java
index deead29..b896cd3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation, Borland Software Corp., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEvaluationEnvironment.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEvaluationEnvironment.java
index 0efc202..f1c9cfa 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEvaluationEnvironment.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2013 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEvaluationVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEvaluationVisitor.java
index fa3fffc..96f6552 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012, 2011 IBM Corporation, Zeligsoft Inc., Borland Software Corp., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java
index 68d70a1..0b2fde0 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeChecker.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2008, 2014, 2014 IBM Corporation, Zeligsoft Inc., Open Canarias S.L., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * 	   IBM - Original org.eclipse.ocl.util.TypeUtil API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeResolver.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeResolver.java
index cc53d1e..3c18851 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeResolver.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AbstractTypeResolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AmbiguousLookupException.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AmbiguousLookupException.java
index b1c155f..00609e6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AmbiguousLookupException.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/AmbiguousLookupException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/Environment.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/Environment.java
index ff8ad89..2ef851c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/Environment.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/Environment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EnvironmentFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EnvironmentFactory.java
index eeed66e..51563df 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EnvironmentFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationEnvironment.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationEnvironment.java
index a8164ba..fb4fc5f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationEnvironment.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationHaltedException.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationHaltedException.java
index 7616ee5..da9313c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationHaltedException.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationHaltedException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Borland Software Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Radek Dvorak - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitor.java
index cd7b80e..1996f1f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorDecorator.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorDecorator.java
index a483565..c80f375 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorDecorator.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorDecorator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorImpl.java
index 9930196..7ad6fc8 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/EvaluationVisitorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/InvalidLookupException.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/InvalidLookupException.java
index 30707f7..82760ad 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/InvalidLookupException.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/InvalidLookupException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LazyExtentMap.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LazyExtentMap.java
index 2ca517f..d0f9124 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LazyExtentMap.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LazyExtentMap.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LookupException.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LookupException.java
index 27d9429..4669164 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LookupException.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/LookupException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *     E.D.Willink - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCL.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCL.java
index 213241e..91bc2b3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCL.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCLInput.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCLInput.java
index 3180a8e..fef437f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCLInput.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/OCLInput.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/ParserException.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/ParserException.java
index c4dec25..b9b2dbd 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/ParserException.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/ParserException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/Query.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/Query.java
index 7a8e1fa..22e7ce2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/Query.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/Query.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/SemanticException.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/SemanticException.java
index 1e31d0f..ed908ee 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/SemanticException.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/SemanticException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/SyntaxException.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/SyntaxException.java
index a8765ea..9e3cc45 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/SyntaxException.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/SyntaxException.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeChecker.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeChecker.java
index 68db9e6..2b4d4df 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeChecker.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeChecker.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2008, 2014 Open Canarias S.L., Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Open Canarias - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeResolver.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeResolver.java
index 3e64422..1b8da64 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeResolver.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/TypeResolver.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/BooleanLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/BooleanLiteralExpCS.java
index e86a917..b24b9a2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/BooleanLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/BooleanLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTFactory.java
index c80de65..1077c30 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTNode.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTNode.java
index 1c0837f..e9f6ee8 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTNode.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTPackage.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTPackage.java
index 15a3c7b..a48fe85 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTPackage.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CSTPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., Borland Software Corp., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CallExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CallExpCS.java
index ee40149..406022e 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CallExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/ClassifierContextDeclCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/ClassifierContextDeclCS.java
index cd01e75..e510252 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/ClassifierContextDeclCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/ClassifierContextDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionLiteralExpCS.java
index 221ccc6..d0fa7b1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionLiteralPartCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionLiteralPartCS.java
index 47e9017..e1780f1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionLiteralPartCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionLiteralPartCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionRangeCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionRangeCS.java
index 5342d1f..15c6fbe 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionRangeCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionRangeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionTypeCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionTypeCS.java
index e6c04fa..b6dfcda 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionTypeCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionTypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionTypeIdentifierEnum.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionTypeIdentifierEnum.java
index b29bc52..04f8c95 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionTypeIdentifierEnum.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/CollectionTypeIdentifierEnum.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/ContextDeclCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/ContextDeclCS.java
index 82d9c8e..69f7568 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/ContextDeclCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/ContextDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DefCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DefCS.java
index 139576a..55d037b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DefCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DefExpressionCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DefExpressionCS.java
index d117128..9bf168c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DefExpressionCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DefExpressionCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DerValueCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DerValueCS.java
index d12bc34..a275a99 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DerValueCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DerValueCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DotOrArrowEnum.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DotOrArrowEnum.java
index 53e8ed5..68f8079 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DotOrArrowEnum.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/DotOrArrowEnum.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/FeatureCallExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/FeatureCallExpCS.java
index 0699a56..b0f5404 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/FeatureCallExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/FeatureCallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IfExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IfExpCS.java
index dafc2d9..015f257 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IfExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IfExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InitOrDerValueCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InitOrDerValueCS.java
index 0d6dd8a..7d840b9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InitOrDerValueCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InitOrDerValueCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InitValueCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InitValueCS.java
index dd52dfa..2d8cb4c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InitValueCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InitValueCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IntegerLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IntegerLiteralExpCS.java
index 7abbdb4..bee5d90 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IntegerLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IntegerLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvCS.java
index 07abbd4..603677a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvOrDefCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvOrDefCS.java
index 28f502f..5c08086 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvOrDefCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvOrDefCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvalidLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvalidLiteralExpCS.java
index 56bc85a..252124e 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvalidLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/InvalidLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IsMarkedPreCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IsMarkedPreCS.java
index 393d0d6..4a8906d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IsMarkedPreCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IsMarkedPreCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IterateExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IterateExpCS.java
index ecdd194..7014374 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IterateExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IterateExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IteratorExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IteratorExpCS.java
index 41b770a..1cc91f1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IteratorExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/IteratorExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LetExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LetExpCS.java
index 79ab4fd..c856aaf 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LetExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LetExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LiteralExpCS.java
index ed3aff9..b909cac 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LoopExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LoopExpCS.java
index 07f0b22..589aa15 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LoopExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/LoopExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/MessageExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/MessageExpCS.java
index fb33b45..072ed7a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/MessageExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/MessageExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/MessageExpKind.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/MessageExpKind.java
index 1e034a9..7ba0741 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/MessageExpKind.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/MessageExpKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/NullLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/NullLiteralExpCS.java
index 7f0b8a6..ac2fd88 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/NullLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/NullLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLDocumentCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLDocumentCS.java
index b0decb4..943e4e2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLDocumentCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLDocumentCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLExpressionCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLExpressionCS.java
index 13a8da4..afb13b0 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLExpressionCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLExpressionCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLMessageArgCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLMessageArgCS.java
index f8e8e63..50b00fa 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLMessageArgCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OCLMessageArgCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationCS.java
index 07156cf..8c7bda6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationCallExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationCallExpCS.java
index 5b0341f..5d1f25c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationCallExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationCallExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationContextDeclCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationContextDeclCS.java
index e492fbc..69ab438 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationContextDeclCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/OperationContextDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PackageDeclarationCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PackageDeclarationCS.java
index 63952c9..a90bcfc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PackageDeclarationCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PackageDeclarationCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PathNameCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PathNameCS.java
index 5c35088..1788b4b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PathNameCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PathNameCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrePostOrBodyDeclCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrePostOrBodyDeclCS.java
index a89cbe3..ecb8a92 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrePostOrBodyDeclCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrePostOrBodyDeclCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrePostOrBodyEnum.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrePostOrBodyEnum.java
index 0c70c4f..66b0499 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrePostOrBodyEnum.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrePostOrBodyEnum.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrimitiveLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrimitiveLiteralExpCS.java
index 5e4644b..75b79f2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrimitiveLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrimitiveLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrimitiveTypeCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrimitiveTypeCS.java
index 0f9e56e..0e1b983 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrimitiveTypeCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PrimitiveTypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PropertyContextCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PropertyContextCS.java
index 949a4ec..dc50faf 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PropertyContextCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/PropertyContextCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/RealLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/RealLiteralExpCS.java
index 6e94c6c..b9a6594 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/RealLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/RealLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/SimpleNameCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/SimpleNameCS.java
index 70f27b5..226caed 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/SimpleNameCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/SimpleNameCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/SimpleTypeEnum.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/SimpleTypeEnum.java
index 3dd97c9..4c597bf 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/SimpleTypeEnum.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/SimpleTypeEnum.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/StringLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/StringLiteralExpCS.java
index 437875e..ac05eba 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/StringLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/StringLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., Borland Software Corp., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TupleLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TupleLiteralExpCS.java
index 034f3c2..5e20f95 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TupleLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TupleLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TupleTypeCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TupleTypeCS.java
index ef32e42..ba37032 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TupleTypeCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TupleTypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TypeCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TypeCS.java
index 75117bd..8d8f496 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TypeCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/TypeCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/UnlimitedNaturalLiteralExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/UnlimitedNaturalLiteralExpCS.java
index 3a84a8b..af4bb7a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/UnlimitedNaturalLiteralExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/UnlimitedNaturalLiteralExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/VariableCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/VariableCS.java
index dc26ac0..30ebac1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/VariableCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/VariableCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/VariableExpCS.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/VariableExpCS.java
index ed29411..ce3cf71 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/VariableExpCS.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/VariableExpCS.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/BooleanLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/BooleanLiteralExpCSImpl.java
index 84257d8..eb056b4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/BooleanLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/BooleanLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTFactoryImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTFactoryImpl.java
index c4c94a1..ab1729e 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTFactoryImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTNodeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTNodeImpl.java
index 3cf9faa..704dc75 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTNodeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTPackageImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTPackageImpl.java
index 7755b82..6752895 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTPackageImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CSTPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., Borland Software Corp., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CallExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CallExpCSImpl.java
index f961502..e28b4e0 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/ClassifierContextDeclCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/ClassifierContextDeclCSImpl.java
index 0e3e4eb..0d742b9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/ClassifierContextDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/ClassifierContextDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionLiteralExpCSImpl.java
index fd972d1..61a104a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionLiteralPartCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionLiteralPartCSImpl.java
index 0cc9ecb..2275e3f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionLiteralPartCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionLiteralPartCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionRangeCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionRangeCSImpl.java
index 3a4ab41..1b04b0c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionRangeCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionRangeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionTypeCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionTypeCSImpl.java
index 27c8fb1..63a768c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionTypeCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/CollectionTypeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/ContextDeclCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/ContextDeclCSImpl.java
index be48886..93a8566 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/ContextDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/ContextDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DefCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DefCSImpl.java
index 5b8c7fe..ac3c135 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DefCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DefExpressionCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DefExpressionCSImpl.java
index 39dae9b..95d89f7 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DefExpressionCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DefExpressionCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DerValueCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DerValueCSImpl.java
index 18b5217..f9f0ecb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DerValueCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/DerValueCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/FeatureCallExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/FeatureCallExpCSImpl.java
index db891d8..99b8d35 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/FeatureCallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/FeatureCallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IfExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IfExpCSImpl.java
index 3e86302..a182d52 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IfExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IfExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InitOrDerValueCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InitOrDerValueCSImpl.java
index f54f3ab..5d6a5fc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InitOrDerValueCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InitOrDerValueCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InitValueCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InitValueCSImpl.java
index 3901ff2..1a6b0fa 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InitValueCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InitValueCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IntegerLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IntegerLiteralExpCSImpl.java
index 388c641..63c5140 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IntegerLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IntegerLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvCSImpl.java
index 8c1e7bf..9f506d6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvOrDefCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvOrDefCSImpl.java
index a594d0f..3cdf445 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvOrDefCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvOrDefCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvalidLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvalidLiteralExpCSImpl.java
index 2247f2b..217068b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvalidLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/InvalidLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IsMarkedPreCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IsMarkedPreCSImpl.java
index 7469287..62db597 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IsMarkedPreCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IsMarkedPreCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IterateExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IterateExpCSImpl.java
index 553385c..2fef552 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IterateExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IterateExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IteratorExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IteratorExpCSImpl.java
index 3fb4c99..fba206d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IteratorExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/IteratorExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LetExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LetExpCSImpl.java
index 338170c..2c12d42 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LetExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LetExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LiteralExpCSImpl.java
index f6f40dc..e10e68b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LoopExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LoopExpCSImpl.java
index b6a8b73..990040e 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LoopExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/LoopExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/MessageExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/MessageExpCSImpl.java
index ef2581d..363747c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/MessageExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/MessageExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/NullLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/NullLiteralExpCSImpl.java
index f6dcbe1..352b657 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/NullLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/NullLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLDocumentCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLDocumentCSImpl.java
index 6239f61..6d6f42f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLDocumentCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLDocumentCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2018 Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLExpressionCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLExpressionCSImpl.java
index c0cc288..3534b12 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLExpressionCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLExpressionCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLMessageArgCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLMessageArgCSImpl.java
index 66ef760..395ae79 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLMessageArgCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OCLMessageArgCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationCSImpl.java
index b5ee7ff..6da9c5b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationCallExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationCallExpCSImpl.java
index 36a652b..47a8d6c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationCallExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationCallExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationContextDeclCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationContextDeclCSImpl.java
index 223b93c..bf01cb4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationContextDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/OperationContextDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PackageDeclarationCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PackageDeclarationCSImpl.java
index 7a3d532..ea8ee47 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PackageDeclarationCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PackageDeclarationCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PathNameCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PathNameCSImpl.java
index 4330cb4..861e2cd 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PathNameCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PathNameCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrePostOrBodyDeclCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrePostOrBodyDeclCSImpl.java
index 829de6d..31e774b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrePostOrBodyDeclCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrePostOrBodyDeclCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrimitiveLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrimitiveLiteralExpCSImpl.java
index c225d3a..8d5b8c2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrimitiveLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrimitiveLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrimitiveTypeCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrimitiveTypeCSImpl.java
index 14cb719..9ef3cc6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrimitiveTypeCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PrimitiveTypeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PropertyContextCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PropertyContextCSImpl.java
index 616afb9..3eb8737 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PropertyContextCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/PropertyContextCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/RealLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/RealLiteralExpCSImpl.java
index 335b2b6..6004b16 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/RealLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/RealLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/SimpleNameCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/SimpleNameCSImpl.java
index 1d09591..fd3f14f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/SimpleNameCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/SimpleNameCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/StringLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/StringLiteralExpCSImpl.java
index 710b3ba..62049e7 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/StringLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/StringLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., Borland Software Corp., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TupleLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TupleLiteralExpCSImpl.java
index 304b4c3..ab230d4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TupleLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TupleLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TupleTypeCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TupleTypeCSImpl.java
index 2e97504..f760fe0 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TupleTypeCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TupleTypeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TypeCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TypeCSImpl.java
index 6a32bae..f43ed97 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TypeCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/TypeCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/UnlimitedNaturalLiteralExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/UnlimitedNaturalLiteralExpCSImpl.java
index eae660b..1187324 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/UnlimitedNaturalLiteralExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/UnlimitedNaturalLiteralExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/VariableCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/VariableCSImpl.java
index fede95c..222efa3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/VariableCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/VariableCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/VariableExpCSImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/VariableExpCSImpl.java
index 7cb2bd1..52226d6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/VariableExpCSImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/impl/VariableExpCSImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTAdapterFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTAdapterFactory.java
index c6dcc25..8a1ab8d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTAdapterFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTSwitch.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTSwitch.java
index 6149b3c..7c7fb4b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTSwitch.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/cst/util/CSTSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/AssociationClassCallExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/AssociationClassCallExp.java
index 930d7be..2e31ce5 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/AssociationClassCallExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/AssociationClassCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/BooleanLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/BooleanLiteralExp.java
index 06de59e..36f4000 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/BooleanLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/BooleanLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CallExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CallExp.java
index fe5feb2..4568440 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CallExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionItem.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionItem.java
index 28a1339..ef5606e 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionItem.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionItem.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionKind.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionKind.java
index 48ace34..d59a9dd 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionKind.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionLiteralExp.java
index 72df61d..970a4da 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionLiteralPart.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionLiteralPart.java
index b3f8c5e..5b8dd80 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionLiteralPart.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionLiteralPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionRange.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionRange.java
index 86b36d9..da25fa4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionRange.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/CollectionRange.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/EnumLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/EnumLiteralExp.java
index cc026a1..e77e1e9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/EnumLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/EnumLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/ExpressionsFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/ExpressionsFactory.java
index 0f216f4..70bf73f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/ExpressionsFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/ExpressionsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/ExpressionsPackage.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/ExpressionsPackage.java
index ba5bedb..3564778 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/ExpressionsPackage.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/ExpressionsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/FeatureCallExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/FeatureCallExp.java
index cb22353..7e0e271 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/FeatureCallExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/FeatureCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IfExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IfExp.java
index 4c8a6bd..c00769d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IfExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IfExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IntegerLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IntegerLiteralExp.java
index ca714ff..9bdb51a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IntegerLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IntegerLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/InvalidLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/InvalidLiteralExp.java
index 6368aaf..a397d3a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/InvalidLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/InvalidLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IterateExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IterateExp.java
index 80c9873..68231ab 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IterateExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IterateExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IteratorExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IteratorExp.java
index 1b46de8..4b84486 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IteratorExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/IteratorExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LetExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LetExp.java
index 6ae87f9..e187e40 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LetExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LetExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LiteralExp.java
index 7819955..1cf71a6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LoopExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LoopExp.java
index ee7bf20..f9bc93d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LoopExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/LoopExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/MessageExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/MessageExp.java
index 8be277e..6481f4d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/MessageExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/MessageExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NavigationCallExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NavigationCallExp.java
index 1d1eeb3..c138082 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NavigationCallExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NavigationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NullLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NullLiteralExp.java
index f36c4b6..e4f2b84 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NullLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NullLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NumericLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NumericLiteralExp.java
index 67b2e5c..05f4546 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NumericLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/NumericLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/OCLExpression.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/OCLExpression.java
index 59dc68f..08db34b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/OCLExpression.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/OCLExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/OperationCallExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/OperationCallExp.java
index 6bde0ef..04a71e9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/OperationCallExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/OperationCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/PrimitiveLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/PrimitiveLiteralExp.java
index 5c092a4..3e96dc1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/PrimitiveLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/PrimitiveLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/PropertyCallExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/PropertyCallExp.java
index 1b433ab..bec5e8c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/PropertyCallExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/PropertyCallExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/RealLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/RealLiteralExp.java
index 95275d4..2ef1f9b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/RealLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/RealLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/StateExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/StateExp.java
index 4bf0680..a6a64d4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/StateExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/StateExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/StringLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/StringLiteralExp.java
index 55f3df3..24decad 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/StringLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/StringLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TupleLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TupleLiteralExp.java
index 9f9caab..0ed65cb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TupleLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TupleLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TupleLiteralPart.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TupleLiteralPart.java
index fa5c698..c1c31c7 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TupleLiteralPart.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TupleLiteralPart.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TypeExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TypeExp.java
index 6a90695..f883e02 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TypeExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/TypeExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/UnlimitedNaturalLiteralExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/UnlimitedNaturalLiteralExp.java
index 1ea94d9..f40c392 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/UnlimitedNaturalLiteralExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/UnlimitedNaturalLiteralExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/UnspecifiedValueExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/UnspecifiedValueExp.java
index 6d22ff5..1332cf9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/UnspecifiedValueExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/UnspecifiedValueExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/Variable.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/Variable.java
index 1223b4d..11e8feb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/Variable.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/Variable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/VariableExp.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/VariableExp.java
index 58ad656..65933ae 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/VariableExp.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/VariableExp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/AssociationClassCallExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/AssociationClassCallExpImpl.java
index 5263eef..c715cf6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/AssociationClassCallExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/AssociationClassCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/BooleanLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/BooleanLiteralExpImpl.java
index ce2fa06..9759aaa 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/BooleanLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/BooleanLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CallExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CallExpImpl.java
index 81c9b10..14b21da 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CallExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionItemImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionItemImpl.java
index b5faa89..2e24243 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionItemImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionItemImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionLiteralExpImpl.java
index dba6c75..ad7cb54 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionLiteralPartImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionLiteralPartImpl.java
index 2b78d8e..14b3b07 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionRangeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionRangeImpl.java
index 4a622fa..debb0fb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionRangeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/CollectionRangeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/EnumLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/EnumLiteralExpImpl.java
index 2cd263f..2e51627 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/EnumLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/EnumLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/ExpressionsFactoryImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/ExpressionsFactoryImpl.java
index 47148bd..ea68763 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/ExpressionsFactoryImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/ExpressionsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/ExpressionsPackageImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/ExpressionsPackageImpl.java
index b33e8ca..58b291e 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/ExpressionsPackageImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/ExpressionsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/FeatureCallExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/FeatureCallExpImpl.java
index e38a1a2..5962234 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/FeatureCallExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/FeatureCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IfExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IfExpImpl.java
index 84078c0..eff6f61 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IfExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IfExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IntegerLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IntegerLiteralExpImpl.java
index aed4c67..d7be647 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IntegerLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IntegerLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/InvalidLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/InvalidLiteralExpImpl.java
index a98c80f..5fdcdfd 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/InvalidLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/InvalidLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IterateExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IterateExpImpl.java
index 692300a..6292540 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IterateExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IterateExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IteratorExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IteratorExpImpl.java
index bea1672..93c0048 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IteratorExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/IteratorExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LetExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LetExpImpl.java
index d471dd9..062593b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LetExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LetExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LiteralExpImpl.java
index 68c2c61..e5d0330 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LoopExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LoopExpImpl.java
index e655274..d41c6aa 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LoopExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/LoopExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/MessageExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/MessageExpImpl.java
index 6a7a86b..2277e7c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/MessageExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/MessageExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NavigationCallExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NavigationCallExpImpl.java
index 38475e3..f8216ac 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NavigationCallExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NavigationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NullLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NullLiteralExpImpl.java
index 7bc7e1f..1fe1121 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NullLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NullLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NumericLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NumericLiteralExpImpl.java
index 80a4c40..cb43e1b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NumericLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/NumericLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/OCLExpressionImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/OCLExpressionImpl.java
index da725d9..8e05c72 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/OCLExpressionImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/OCLExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/OperationCallExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/OperationCallExpImpl.java
index 8a9dbe3..875c1ab 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/OperationCallExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/OperationCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/PrimitiveLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/PrimitiveLiteralExpImpl.java
index ff3284a..f321d14 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/PrimitiveLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/PrimitiveLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/PropertyCallExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/PropertyCallExpImpl.java
index fb90885..124f6aa 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/PropertyCallExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/PropertyCallExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/RealLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/RealLiteralExpImpl.java
index d56eb28..902da0c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/RealLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/RealLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/StateExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/StateExpImpl.java
index 9b2ecfb..92d767f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/StateExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/StateExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/StringLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/StringLiteralExpImpl.java
index 449395c..cd772ad 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/StringLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/StringLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TupleLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TupleLiteralExpImpl.java
index dd75aed..48d3f6b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TupleLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TupleLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TupleLiteralPartImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TupleLiteralPartImpl.java
index 793a3e2..3a7e5d4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TupleLiteralPartImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TupleLiteralPartImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TypeExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TypeExpImpl.java
index 107a04f..c00476f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TypeExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/TypeExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/UnlimitedNaturalLiteralExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/UnlimitedNaturalLiteralExpImpl.java
index fdf52d2..3f09994 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/UnlimitedNaturalLiteralExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/UnlimitedNaturalLiteralExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/UnspecifiedValueExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/UnspecifiedValueExpImpl.java
index 248e231..b6af37a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/UnspecifiedValueExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/UnspecifiedValueExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/VariableExpImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/VariableExpImpl.java
index 299217c..1e2156e 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/VariableExpImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/VariableExpImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/VariableImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/VariableImpl.java
index 8b00735..60f3f36 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/VariableImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/VariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/package.html
index 5ae0f46..b15fe72 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/impl/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/BooleanLiteralExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/BooleanLiteralExpOperations.java
index 0037a98..a0a473d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/BooleanLiteralExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/BooleanLiteralExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionItemOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionItemOperations.java
index 95240b0..e89db2d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionItemOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionItemOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionLiteralExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionLiteralExpOperations.java
index 3e707d2..34216df 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionLiteralExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionLiteralExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionLiteralPartOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionLiteralPartOperations.java
index 845ff16..1d4c075 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionLiteralPartOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionLiteralPartOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionRangeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionRangeOperations.java
index 5a0952a..b69ce8a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionRangeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/CollectionRangeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/EnumLiteralExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/EnumLiteralExpOperations.java
index dc32cdd..4cac039 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/EnumLiteralExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/EnumLiteralExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IfExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IfExpOperations.java
index 4b3f3a6..78f3553 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IfExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IfExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IntegerLiteralExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IntegerLiteralExpOperations.java
index fc5e83d..f829c10 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IntegerLiteralExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IntegerLiteralExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IterateExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IterateExpOperations.java
index aa68e06..be70e31 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IterateExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IterateExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IteratorExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IteratorExpOperations.java
index b8788cb..1d0c577 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IteratorExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/IteratorExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/LetExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/LetExpOperations.java
index dabe309..c1fd2f2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/LetExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/LetExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/LoopExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/LoopExpOperations.java
index 209ab09..a707e79 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/LoopExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/LoopExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/MessageExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/MessageExpOperations.java
index 63cbbae..ad8ec08 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/MessageExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/MessageExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/OCLExpressionOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/OCLExpressionOperations.java
index 78405a2..d85d222 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/OCLExpressionOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/OCLExpressionOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/OperationCallExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/OperationCallExpOperations.java
index 1875b7a..b8eac92 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/OperationCallExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/OperationCallExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 IBM Corporation, Zeligsoft Inc., Open Canarias S.L., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/PropertyCallExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/PropertyCallExpOperations.java
index 92d1885..8cae26f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/PropertyCallExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/PropertyCallExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/RealLiteralExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/RealLiteralExpOperations.java
index 7063fb7..344d30d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/RealLiteralExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/RealLiteralExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/StringLiteralExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/StringLiteralExpOperations.java
index 504db6c..baf76c8 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/StringLiteralExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/StringLiteralExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/TupleLiteralExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/TupleLiteralExpOperations.java
index a866b41..45970be 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/TupleLiteralExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/TupleLiteralExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/TupleLiteralPartOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/TupleLiteralPartOperations.java
index f9ab838..c74bb47 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/TupleLiteralPartOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/TupleLiteralPartOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/UnlimitedNaturalLiteralExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/UnlimitedNaturalLiteralExpOperations.java
index a87049b..47de2be 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/UnlimitedNaturalLiteralExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/UnlimitedNaturalLiteralExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/VariableExpOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/VariableExpOperations.java
index 0aa6db9..74131b1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/VariableExpOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/VariableExpOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/VariableOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/VariableOperations.java
index 8601daf..476fc85 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/VariableOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/operations/VariableOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/package.html
index 215dc26..23f46a7 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsAdapterFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsAdapterFactory.java
index d37582a..afa397f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsAdapterFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsSwitch.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsSwitch.java
index 110effb..28ea82f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsSwitch.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsValidator.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsValidator.java
index 23d97d6..8a15a79 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsValidator.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/ExpressionsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/package.html
index 2527bcc..6623e69 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/expressions/util/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/Choice.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/Choice.java
index 9194f29..0ff739c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/Choice.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/Choice.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/ChoiceKind.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/ChoiceKind.java
index 1d338f6..75c99c0 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/ChoiceKind.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/ChoiceKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2002, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/ConstraintKind.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/ConstraintKind.java
index 7996182..97d35d6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/ConstraintKind.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/ConstraintKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/OCLHelper.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/OCLHelper.java
index 836e53c..6b8ab0f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/OCLHelper.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/OCLHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2008 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/OCLSyntaxHelper.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/OCLSyntaxHelper.java
index f8dd559..8fbb200 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/OCLSyntaxHelper.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/OCLSyntaxHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/package.html
index 7b33d2b..dd7a6d2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/helper/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2004, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/EnvironmentRegistryImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/EnvironmentRegistryImpl.java
index 3785c81..104b8b3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/EnvironmentRegistryImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/EnvironmentRegistryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLDebugOptions.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLDebugOptions.java
index fe72e6d..9b82b21 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLDebugOptions.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLDebugOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLPlugin.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLPlugin.java
index ae75cf3..57b6d4d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLPlugin.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLPlugin.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLStatusCodes.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLStatusCodes.java
index 3d44d6b..b9d1ddb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLStatusCodes.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/OCLStatusCodes.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2009 IBM Corporation, Borland Software Corporation, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/PreferenceInitializer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/PreferenceInitializer.java
index 0d80da2..d4d011c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/PreferenceInitializer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/PreferenceInitializer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/BasicTypeChecker.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/BasicTypeChecker.java
index f2b1c08..1f5c7bf 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/BasicTypeChecker.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/BasicTypeChecker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/CachedTypeChecker.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/CachedTypeChecker.java
index 398c702..8d4634f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/CachedTypeChecker.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/CachedTypeChecker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplate.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplate.java
index 268e596..ae232a4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplate.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation, Borland Software Corporation, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateAny.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateAny.java
index 190fb7c..b81bff6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateAny.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateAny.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2013 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateClosure.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateClosure.java
index 5a8929a..1a776bb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateClosure.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateClosure.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateCollect.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateCollect.java
index 495178c..3aafb08 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateCollect.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateCollect.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateCollectNested.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateCollectNested.java
index a936c25..f84a255 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateCollectNested.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateCollectNested.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateExists.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateExists.java
index 83573d6..84a347c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateExists.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateExists.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateForAll.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateForAll.java
index 7667873..677f99c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateForAll.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateForAll.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateIsUnique.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateIsUnique.java
index d725fd6..c3d2973 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateIsUnique.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateIsUnique.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateOne.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateOne.java
index 777ddb6..57fa47c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateOne.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateOne.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateReject.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateReject.java
index cff29d7..9c4cb6c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateReject.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateReject.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateSelect.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateSelect.java
index b16d04f..a5c8203 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateSelect.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateSelect.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateSortedBy.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateSortedBy.java
index c1786ca..99de0a0 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateSortedBy.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/IterationTemplateSortedBy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/NumberUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/NumberUtil.java
index 553d7dd..9ba5e95 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/NumberUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/NumberUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Andreas Werner - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/QueryImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/QueryImpl.java
index f50f013..22b0050 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/QueryImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/QueryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation, Borland Software Corporation, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/TracingEvaluationVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/TracingEvaluationVisitor.java
index 8ad2319..2fb7d29 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/TracingEvaluationVisitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/evaluation/TracingEvaluationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/ChoiceImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/ChoiceImpl.java
index d127a75..5ac63fc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/ChoiceImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/ChoiceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2002, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/HelperUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/HelperUtil.java
index d5f77fd..229bc20 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/HelperUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/HelperUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2002, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLHelperImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLHelperImpl.java
index 37db3c8..bd63140 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLHelperImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLHelperImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2002, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java
index 88dd018..2e87ddb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2002, 2014 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/PluginFinder.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/PluginFinder.java
index ff64c7b..e6660d5 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/PluginFinder.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/helper/PluginFinder.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   EDW - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/IMessages.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/IMessages.java
index 162e721..1c66d31 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/IMessages.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/IMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/OCLMessages.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/OCLMessages.java
index 9cd790a..1ff157a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/OCLMessages.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/OCLMessages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/OCLMessages.properties b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/OCLMessages.properties
index ad2ff66..2ebce43 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/OCLMessages.properties
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/internal/l10n/OCLMessages.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2003, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractAnalyzer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractAnalyzer.java
index 267f219..dce836f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractAnalyzer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractBasicEnvironment.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractBasicEnvironment.java
index 7891c3c..9c027db 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractBasicEnvironment.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractBasicEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2013 IBM Corporation, Zeligsoft Inc., Borland Software Corp., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractFormattingHelper.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractFormattingHelper.java
index cebb7c7..c389324 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractFormattingHelper.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractFormattingHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractLexer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractLexer.java
index 1102e29..3a78d24 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractLexer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractLexer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2014 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java
index 7d6fd31..e26d272 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractProblemHandler.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractProblemHandler.java
index e6fc808..926db76 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractProblemHandler.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/AbstractProblemHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/BasicEnvironment.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/BasicEnvironment.java
index 249360c..cb5e110 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/BasicEnvironment.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/BasicEnvironment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/BasicEnvironment2.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/BasicEnvironment2.java
index e81b686..dd15624 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/BasicEnvironment2.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/BasicEnvironment2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008 Willink Transformations, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/DerivedLexStream.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/DerivedLexStream.java
index 10a3503..de68442 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/DerivedLexStream.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/DerivedLexStream.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2010 Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (Open Canarias)- Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/DerivedPrsStream.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/DerivedPrsStream.java
index 291e4a1..c8aebea 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/DerivedPrsStream.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/DerivedPrsStream.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2010 Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Adolfo Sanchez-Barbudo Herrera (Open Canarias)- Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/FormattingHelper.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/FormattingHelper.java
index b52a853..8b80093 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/FormattingHelper.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/FormattingHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/ProblemHandler.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/ProblemHandler.java
index 9f1e755..6a747e3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/ProblemHandler.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/ProblemHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2008 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/StringProblemHandler.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/StringProblemHandler.java
index 2cca379..8ac431a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/StringProblemHandler.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/lpg/StringProblemHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/BasicOption.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/BasicOption.java
index b8e3834..ee44613 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/BasicOption.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/BasicOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/BooleanOption.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/BooleanOption.java
index fa065ac..9c50966 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/BooleanOption.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/BooleanOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ClassOption.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ClassOption.java
index b0b57fd..6ad0145 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ClassOption.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ClassOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/Customizable.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/Customizable.java
index 711d870..afb1ec9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/Customizable.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/Customizable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EnumeratedOption.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EnumeratedOption.java
index bb65446..3b5b845 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EnumeratedOption.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EnumeratedOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EvaluationOptions.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EvaluationOptions.java
index 43c4f0e..ea84b4a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EvaluationOptions.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/EvaluationOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ObjectOption.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ObjectOption.java
index efe27aa..2246b3d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ObjectOption.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ObjectOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/Option.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/Option.java
index 0dc8d2f..a5e5aef 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/Option.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/Option.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ParsingOptions.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ParsingOptions.java
index 552f07f..0ce00a9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ParsingOptions.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ParsingOptions.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ProblemOption.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ProblemOption.java
index 95dc6b6..756cefa 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ProblemOption.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/options/ProblemOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/package.html
index 55d2312..bfcb3c9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2004, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLAnalyzer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLAnalyzer.java
index 748a2fd..443d735 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLAnalyzer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLParser.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLParser.java
index 57ae4c3..92d3557 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLParser.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/AbstractOCLParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCL.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCL.gi
index e2d8d42..e5c221f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCL.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCL.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -71,9 +71,9 @@
  *
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCLKWLexer.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCLKWLexer.gi
index d27b73f..2b23afe 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCLKWLexer.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCLKWLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -46,9 +46,9 @@
  *
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCLLexer.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCLLexer.gi
index 3921c93..8f0b4d9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCLLexer.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/EssentialOCLLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -89,9 +89,9 @@
  *
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLAnalyzer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLAnalyzer.java
index 96ad9f2..52ce615 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLAnalyzer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLAnalyzer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLFactoryWithHistory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLFactoryWithHistory.java
index 0407859..07a9150 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLFactoryWithHistory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLFactoryWithHistory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexer.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexer.gi
index cbc823a..7f8f07f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexer.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -35,9 +35,9 @@
  *
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexer.java
index f0a41c2..dd497fc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexer.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexerprs.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexerprs.java
index 3577876..060acbe 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexerprs.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexerprs.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexersym.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexersym.java
index 0f113ef..cb08efd 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexersym.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLKWLexersym.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexer.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexer.gi
index 6d9b00e..a6763e8 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexer.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -48,9 +48,9 @@
  *
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexer.java
index b0f6219..adb445f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexer.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexerprs.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexerprs.java
index d11ff92..88fe54b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexerprs.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexerprs.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexersym.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexersym.java
index 7dda37e..ad440e8 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexersym.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLLexersym.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.g b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.g
index da7ef7b..88f2d00 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.g
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.g
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   See (or edit) Notice Declaration below
@@ -41,9 +41,9 @@
  *
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.java
index 054c6bb..1ecf997 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParser.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParserprs.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParserprs.java
index 06d815d..4771fb9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParserprs.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParserprs.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParsersym.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParsersym.java
index 41bb7fe..3026830 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParsersym.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLParsersym.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLProblemHandler.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLProblemHandler.java
index 74c3685..20bc950 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLProblemHandler.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/OCLProblemHandler.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/ValidationVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/ValidationVisitor.java
index ed96943..33dbfa6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/ValidationVisitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/ValidationVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/EssentialOCLErrors.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/EssentialOCLErrors.gi
index 7d267ee..ede3a0f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/EssentialOCLErrors.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/EssentialOCLErrors.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2008, 2009 Eclipse.org 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexer.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexer.gi
index 0c2491d..7742457 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexer.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2008, 2009 IBM Corporation 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexer.java
index 73591a2..4863e1f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexer.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexerprs.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexerprs.java
index 6d2dc50..414f097 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexerprs.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexerprs.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexersym.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexersym.java
index f457429..56983d8 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexersym.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingKWLexersym.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2012 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexer.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexer.gi
index 1dbf011..60ce17f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexer.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexer.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2008, 2009 Eclipse.org 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexer.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexer.java
index 0838585..db739af 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexer.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexer.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexerprs.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexerprs.java
index 697e82e..38f77d3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexerprs.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexerprs.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexersym.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexersym.java
index 3d266eb..71d1881 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexersym.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingLexersym.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.g b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.g
index 49e53a9..10fc563 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.g
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.g
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2008, 2009 Eclipse.org 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.java
index b34dce2..4f043bb 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParser.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParserprs.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParserprs.java
index 20b51ec..74c9d5b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParserprs.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParserprs.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParsersym.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParsersym.java
index 35aac06..7d7e11c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParsersym.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLBacktrackingParsersym.java
@@ -4,9 +4,9 @@
 *
 * Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-v20.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.gi b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.gi
index b76551e..def4200 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.gi
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.gi
@@ -3,9 +3,9 @@
 -- *
 -- * Copyright (c) 2008 Eclipse.org 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 v2.0
 -- * which accompanies this distribution, and is available at
--- * http://www.eclipse.org/legal/epl-v10.html
+-- * http://www.eclipse.org/legal/epl-v20.html
 -- *
 -- * Contributors:
 -- *   E.D. Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.java
index 74c44a3..d9701da 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2009 Eclipse.org, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/AnyType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/AnyType.java
index af3d8ab..cb371b1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/AnyType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/AnyType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/BagType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/BagType.java
index d8fbc0d..c36e46d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/BagType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/BagType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/CollectionType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/CollectionType.java
index d220f44..9f9d852 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/CollectionType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/CollectionType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/ElementType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/ElementType.java
index c9258d7..7a01a28 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/ElementType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/ElementType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/InvalidType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/InvalidType.java
index d2c0430..e36632a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/InvalidType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/InvalidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/MessageType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/MessageType.java
index 7e9ee10..9e09758 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/MessageType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/MessageType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/OCLStandardLibrary.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/OCLStandardLibrary.java
index 47813d9..bfdb1d5 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/OCLStandardLibrary.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/OCLStandardLibrary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/OrderedSetType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/OrderedSetType.java
index 55dc502..7e33a08 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/OrderedSetType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/OrderedSetType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/PrimitiveType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/PrimitiveType.java
index f801652..8a6987a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/PrimitiveType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/PrimitiveType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/SequenceType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/SequenceType.java
index 56a246f..2220957 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/SequenceType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/SequenceType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/SetType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/SetType.java
index be5137b..409ea62 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/SetType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/SetType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TemplateParameterType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TemplateParameterType.java
index 508fe74..c853aa3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TemplateParameterType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TemplateParameterType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TupleType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TupleType.java
index f1812b9..1e5b68c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TupleType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TupleType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypeType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypeType.java
index a70bf67..e58f54c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypeType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypeType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypesFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypesFactory.java
index 6f2f56f..ce2878d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypesFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypesFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypesPackage.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypesPackage.java
index 35de6dd..7469432 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypesPackage.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/TypesPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/VoidType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/VoidType.java
index 926a1d9..3636a63 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/VoidType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/VoidType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/AnyTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/AnyTypeImpl.java
index 6c6709c..e853752 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/AnyTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/AnyTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/BagTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/BagTypeImpl.java
index 8b13c1a..32a194f 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/BagTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/BagTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/CollectionTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/CollectionTypeImpl.java
index 5bc9dd6..47bb960 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/CollectionTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/CollectionTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/ElementTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/ElementTypeImpl.java
index e1fa468..5108e92 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/ElementTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/ElementTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/InvalidTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/InvalidTypeImpl.java
index ea771ee..6a4ddb9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/InvalidTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/InvalidTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/MessageTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/MessageTypeImpl.java
index 74aad98..06aa121 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/MessageTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/MessageTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/OrderedSetTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/OrderedSetTypeImpl.java
index 55fe3c2..5ffd7e0 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/OrderedSetTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/OrderedSetTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/PrimitiveTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/PrimitiveTypeImpl.java
index 1942f0f..b738c6c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/PrimitiveTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/PrimitiveTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/SequenceTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/SequenceTypeImpl.java
index 75ccb43..607045a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/SequenceTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/SequenceTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/SetTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/SetTypeImpl.java
index 21da9a8..299ea3d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/SetTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/SetTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TemplateParameterTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TemplateParameterTypeImpl.java
index 3fe835c..5cefa91 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TemplateParameterTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TemplateParameterTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TupleTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TupleTypeImpl.java
index 967820c..9195857 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TupleTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TupleTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypeTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypeTypeImpl.java
index 405531d..6485938 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypeTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypeTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypesFactoryImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypesFactoryImpl.java
index c124efa..04168dd 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypesFactoryImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypesFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypesPackageImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypesPackageImpl.java
index de483ee..e452f75 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypesPackageImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/TypesPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/VoidTypeImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/VoidTypeImpl.java
index f1f3791..feb5163 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/VoidTypeImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/VoidTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/package.html
index 6cb7ea3..3756772 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/impl/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/AnyTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/AnyTypeOperations.java
index bd4b3d2..3ddd60a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/AnyTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/AnyTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/BagTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/BagTypeOperations.java
index babee0d..ddb6675 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/BagTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/BagTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/CollectionTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/CollectionTypeOperations.java
index 46d7f1a..09022a7 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/CollectionTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/CollectionTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/InvalidTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/InvalidTypeOperations.java
index fdf73bf..624271a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/InvalidTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/InvalidTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/MessageTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/MessageTypeOperations.java
index 0ce4bdb..42d69de 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/MessageTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/MessageTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/OrderedSetTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/OrderedSetTypeOperations.java
index 0628849..afcad79 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/OrderedSetTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/OrderedSetTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/PrimitiveTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/PrimitiveTypeOperations.java
index 63af609..9f7e285 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/PrimitiveTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/PrimitiveTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/SequenceTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/SequenceTypeOperations.java
index 438d7a6..69b8328 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/SequenceTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/SequenceTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/SetTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/SetTypeOperations.java
index 1d2b3ba..8977f56 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/SetTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/SetTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TemplateParameterTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TemplateParameterTypeOperations.java
index 3d693ab..4761102 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TemplateParameterTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TemplateParameterTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TupleTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TupleTypeOperations.java
index cc74ec0..3b36f3c 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TupleTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TupleTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TypeTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TypeTypeOperations.java
index d3738bf..990e7bc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TypeTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/TypeTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/VoidTypeOperations.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/VoidTypeOperations.java
index 54b7a4c..bc53a08 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/VoidTypeOperations.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/operations/VoidTypeOperations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Zeligsoft - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/package.html
index 27420cd..1146cc6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesAdapterFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesAdapterFactory.java
index 49c43b5..c03bb26 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesAdapterFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesSwitch.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesSwitch.java
index 00007ca..db4eeb2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesSwitch.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2014 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesValidator.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesValidator.java
index 6330b37..7e76a82 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesValidator.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/TypesValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/package.html
index fa9a6f7..4705a4d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/types/util/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Adaptable.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Adaptable.java
index eba2fc6..2ec5743 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Adaptable.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Adaptable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Bag.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Bag.java
index e6ecea5..6208fe4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Bag.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Bag.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/BagImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/BagImpl.java
index c007b89..e9476b2 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/BagImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/BagImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/CollectionUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/CollectionUtil.java
index 24374b8..1dcf250 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/CollectionUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/CollectionUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012, 2011 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java
index e9405c7..9b0faa9 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2014, 2017 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLTypeChecker.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLTypeChecker.java
index 6f42a1e..27f8700 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLTypeChecker.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLTypeChecker.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2008, 2014 Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Open Canarias - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLUtil.java
index 90cfe4f..e41daee 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ObjectUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ObjectUtil.java
index 33b9704..077623a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ObjectUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ObjectUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2011, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ProblemAware.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ProblemAware.java
index 9101a3f..a6381de 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ProblemAware.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ProblemAware.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Borland Software Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Radek Dvorak - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ProblemHandlerWrapper.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ProblemHandlerWrapper.java
index 00359e0..d8d66e3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ProblemHandlerWrapper.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ProblemHandlerWrapper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ToStringVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ToStringVisitor.java
index bcb42ab..6792974 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ToStringVisitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/ToStringVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Tuple.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Tuple.java
index 1f02266..c4d1ea4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Tuple.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/Tuple.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/TypeUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/TypeUtil.java
index 83e1a67..ee107d6 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/TypeUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/TypeUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2010 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/UnicodeSupport.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/UnicodeSupport.java
index bd50738..e9464ad 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/UnicodeSupport.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/UnicodeSupport.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/package.html
index 5f287d8..c9ac539 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/package.html
@@ -8,9 +8,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ASTNode.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ASTNode.java
index 86e663f..a6a0d2e 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ASTNode.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ASTNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java
index 3fe11aa..4e3abc8 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/CallingASTNode.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/CallingASTNode.java
index 8474e70..6b20a8b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/CallingASTNode.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/CallingASTNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ExpressionInOCL.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ExpressionInOCL.java
index 54d11e3..17bb8a4 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ExpressionInOCL.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/ExpressionInOCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/OCLFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/OCLFactory.java
index 333fe9a..07e2395 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/OCLFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/OCLFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/PredefinedType.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/PredefinedType.java
index c9c2657..0aa9d2a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/PredefinedType.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/PredefinedType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/TypedASTNode.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/TypedASTNode.java
index 90f29ec..9aaf6a3 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/TypedASTNode.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/TypedASTNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/TypedElement.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/TypedElement.java
index 3c95c22..76f7cfc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/TypedElement.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/TypedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UMLReflection.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UMLReflection.java
index f4785dd..ac7806b 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UMLReflection.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UMLReflection.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UtilitiesFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UtilitiesFactory.java
index 212916c..42f55079 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UtilitiesFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UtilitiesFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UtilitiesPackage.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UtilitiesPackage.java
index 9e778c8..21906dc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UtilitiesPackage.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/UtilitiesPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/Visitable.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/Visitable.java
index 5d14968..a4bfd8d 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/Visitable.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/Visitable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/Visitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/Visitor.java
index 7c583c6..313b1c1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/Visitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/Visitor.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2008 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/UtilitiesFactoryImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/UtilitiesFactoryImpl.java
index 1ab25fe..1ef64d1 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/UtilitiesFactoryImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/UtilitiesFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/UtilitiesPackageImpl.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/UtilitiesPackageImpl.java
index d94e146..741fe73 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/UtilitiesPackageImpl.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/UtilitiesPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/package.html
index 028673b..a1a4dd5 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/impl/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/package.html
index 4c535d0..d080760 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/package.html
@@ -8,9 +8,9 @@
 /******************************************************************************
  * Copyright (c) 2006, 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesAdapterFactory.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesAdapterFactory.java
index e4550be..7208495 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesAdapterFactory.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesSwitch.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesSwitch.java
index 59ff051..3d9737a 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesSwitch.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/UtilitiesSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/package.html b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/package.html
index a9f8f2b..7403acc 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/package.html
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/util/package.html
@@ -6,9 +6,9 @@
 /******************************************************************************
  * Copyright (c) 2007 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *    IBM Corporation - initial API and implementation 
diff --git a/plugins/org.eclipse.ocl/templates/Header.javajetinc b/plugins/org.eclipse.ocl/templates/Header.javajetinc
index a6b94ea..9bb6332 100644
--- a/plugins/org.eclipse.ocl/templates/Header.javajetinc
+++ b/plugins/org.eclipse.ocl/templates/Header.javajetinc
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/plugins/org.eclipse.ocl/templates/Header.propertiesjetinc b/plugins/org.eclipse.ocl/templates/Header.propertiesjetinc
index 8a93936..8d964e1 100644
--- a/plugins/org.eclipse.ocl/templates/Header.propertiesjetinc
+++ b/plugins/org.eclipse.ocl/templates/Header.propertiesjetinc
@@ -1,8 +1,8 @@
 # Copyright (c) 2009 Eclipse Modeling Project 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #   IBM - initial API and implementation
diff --git a/plugins/org.eclipse.ocl/templates/Header.xmljetinc b/plugins/org.eclipse.ocl/templates/Header.xmljetinc
index cee5fdb..a8f2a38 100644
--- a/plugins/org.eclipse.ocl/templates/Header.xmljetinc
+++ b/plugins/org.eclipse.ocl/templates/Header.xmljetinc
@@ -1,9 +1,9 @@
 <!--
  Copyright (c) 2009 Eclipse Modeling Project 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 v2.0
  which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ http://www.eclipse.org/legal/epl-v20.html
 
  Contributors:
    IBM - initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng.build-site/build.properties b/releng/org.eclipse.ocl.releng.build-site/build.properties
index b00a940..9ada34a 100644
--- a/releng/org.eclipse.ocl.releng.build-site/build.properties
+++ b/releng/org.eclipse.ocl.releng.build-site/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng.build-site/downloads.sh b/releng/org.eclipse.ocl.releng.build-site/downloads.sh
index ce8aed1..e684358 100644
--- a/releng/org.eclipse.ocl.releng.build-site/downloads.sh
+++ b/releng/org.eclipse.ocl.releng.build-site/downloads.sh
@@ -2,9 +2,9 @@
 #*******************************************************************************
 # Copyright (c) 2018 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng.build-site/feature.properties b/releng/org.eclipse.ocl.releng.build-site/feature.properties
index 6575f28..d73a5bb 100644
--- a/releng/org.eclipse.ocl.releng.build-site/feature.properties
+++ b/releng/org.eclipse.ocl.releng.build-site/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2014 Open Canarias S.L. 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Open Canarias) - Initial API and Implemantation
diff --git a/releng/org.eclipse.ocl.releng.build-site/updates.sh b/releng/org.eclipse.ocl.releng.build-site/updates.sh
index 0e3b7fe..f74b23d 100644
--- a/releng/org.eclipse.ocl.releng.build-site/updates.sh
+++ b/releng/org.eclipse.ocl.releng.build-site/updates.sh
@@ -2,9 +2,9 @@
 #*******************************************************************************
 # Copyright (c) 2018 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng.consumers.build-feature/build.properties b/releng/org.eclipse.ocl.releng.consumers.build-feature/build.properties
index eed5618..87f5bad 100644
--- a/releng/org.eclipse.ocl.releng.consumers.build-feature/build.properties
+++ b/releng/org.eclipse.ocl.releng.consumers.build-feature/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng.consumers.build-feature/feature.properties b/releng/org.eclipse.ocl.releng.consumers.build-feature/feature.properties
index 3b77649..ae5c57e 100644
--- a/releng/org.eclipse.ocl.releng.consumers.build-feature/feature.properties
+++ b/releng/org.eclipse.ocl.releng.consumers.build-feature/feature.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2011, 2014 Open Canarias S.L. 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Open Canarias) - Initial API and Implemantation
diff --git a/releng/org.eclipse.ocl.releng.tycho/pom.xml b/releng/org.eclipse.ocl.releng.tycho/pom.xml
index 2b96c83..7f88569 100644
--- a/releng/org.eclipse.ocl.releng.tycho/pom.xml
+++ b/releng/org.eclipse.ocl.releng.tycho/pom.xml
@@ -3,9 +3,9 @@
    Copyright (c) 2017 Willink Transformations 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 v2.0
    which accompanies this distribution, and is available at
-   http://www.eclipse.org/legal/epl-v10.html
+   http://www.eclipse.org/legal/epl-v20.html
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -19,12 +19,12 @@
   <packaging>pom</packaging>
   <licenses>
     <license>
-      <name>Eclipse Public License v1.0</name>
+      <name>Eclipse Public License v2.0</name>
       <comments>
         All rights reserved.
 
         This program and the accompanying materials are made
-        available under the terms of the Eclipse Public License v1.0
+        available under the terms of the Eclipse Public License v2.0
         which accompanies this distribution, and is available at
         http://www.eclipse.org/legal/epl-v10.htm
       </comments>
diff --git a/releng/org.eclipse.ocl.releng/scripts/checkMD5.sh b/releng/org.eclipse.ocl.releng/scripts/checkMD5.sh
index e9fa7f0..a29afa6 100644
--- a/releng/org.eclipse.ocl.releng/scripts/checkMD5.sh
+++ b/releng/org.eclipse.ocl.releng/scripts/checkMD5.sh
@@ -2,9 +2,9 @@
 #*******************************************************************************
 # Copyright (c) 2013, 2015 Willink Transformations, University of York 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Univerisity of York) - Initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng/scripts/checkSHA.sh b/releng/org.eclipse.ocl.releng/scripts/checkSHA.sh
index a9e31fe..d6dd092 100644
--- a/releng/org.eclipse.ocl.releng/scripts/checkSHA.sh
+++ b/releng/org.eclipse.ocl.releng/scripts/checkSHA.sh
@@ -2,9 +2,9 @@
 #*******************************************************************************
 # Copyright (c) 2013, 2015 Willink Transformations, University of York 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Univerisity of York) - Initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng/scripts/renameMD5.sh b/releng/org.eclipse.ocl.releng/scripts/renameMD5.sh
index 5d28be1..60b7f95 100644
--- a/releng/org.eclipse.ocl.releng/scripts/renameMD5.sh
+++ b/releng/org.eclipse.ocl.releng/scripts/renameMD5.sh
@@ -2,9 +2,9 @@
 #*******************************************************************************
 # Copyright (c) 2013, 2015 Willink Transformations, University of York 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Univerisity of York) - Initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng/scripts/renameSHA.sh b/releng/org.eclipse.ocl.releng/scripts/renameSHA.sh
index de1bea3..734c8c9 100644
--- a/releng/org.eclipse.ocl.releng/scripts/renameSHA.sh
+++ b/releng/org.eclipse.ocl.releng/scripts/renameSHA.sh
@@ -2,9 +2,9 @@
 #*******************************************************************************
 # Copyright (c) 2013, 2015 Willink Transformations, University of York 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Univerisity of York) - Initial API and implementation
diff --git a/releng/org.eclipse.ocl.releng/scripts/renameZips.sh b/releng/org.eclipse.ocl.releng/scripts/renameZips.sh
index 08039a3..d4671a0 100644
--- a/releng/org.eclipse.ocl.releng/scripts/renameZips.sh
+++ b/releng/org.eclipse.ocl.releng/scripts/renameZips.sh
@@ -2,9 +2,9 @@
 #*******************************************************************************
 # Copyright (c) 2013, 2015 Willink Transformations, University of York 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     Adolfo Sanchez-Barbudo Herrera (Univerisity of York) - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/about.html b/tests/org.eclipse.ocl.ecore.tests/about.html
index c0be2e9..e9d1dac 100644
--- a/tests/org.eclipse.ocl.ecore.tests/about.html
+++ b/tests/org.eclipse.ocl.ecore.tests/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.ecore.tests/about.properties b/tests/org.eclipse.ocl.ecore.tests/about.properties
index 2ee8d92..46c8314 100644
--- a/tests/org.eclipse.ocl.ecore.tests/about.properties
+++ b/tests/org.eclipse.ocl.ecore.tests/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/build.properties b/tests/org.eclipse.ocl.ecore.tests/build.properties
index 6e64af0..6aaf2c9 100644
--- a/tests/org.eclipse.ocl.ecore.tests/build.properties
+++ b/tests/org.eclipse.ocl.ecore.tests/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/plugin.properties b/tests/org.eclipse.ocl.ecore.tests/plugin.properties
index 52333ac..10b1513 100644
--- a/tests/org.eclipse.ocl.ecore.tests/plugin.properties
+++ b/tests/org.eclipse.ocl.ecore.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/Bug418716.java b/tests/org.eclipse.ocl.ecore.tests/src/company/Bug418716.java
index e9e5e98..d0bbc2f 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/Bug418716.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/Bug418716.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/Company.java b/tests/org.eclipse.ocl.ecore.tests/src/company/Company.java
index 439276c..f5c7610 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/Company.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/Company.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/CompanyFactory.java b/tests/org.eclipse.ocl.ecore.tests/src/company/CompanyFactory.java
index 7dbe653..31fa4b5 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/CompanyFactory.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/CompanyFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/CompanyPackage.java b/tests/org.eclipse.ocl.ecore.tests/src/company/CompanyPackage.java
index 520396e..be125f7 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/CompanyPackage.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/CompanyPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/CompanySizeKind.java b/tests/org.eclipse.ocl.ecore.tests/src/company/CompanySizeKind.java
index 0291ff2..6ecaee0 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/CompanySizeKind.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/CompanySizeKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/Employee.java b/tests/org.eclipse.ocl.ecore.tests/src/company/Employee.java
index 01013a7..bb64aae 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/Employee.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/Employee.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/Bug418716Impl.java b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/Bug418716Impl.java
index cef5e03..53704b2 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/Bug418716Impl.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/Bug418716Impl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyFactoryImpl.java b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyFactoryImpl.java
index 7e91a9f..ddb1550 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyFactoryImpl.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyImpl.java b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyImpl.java
index 5332412..18a6f79 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyImpl.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyPackageImpl.java b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyPackageImpl.java
index 723971f..0c1c5a4 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyPackageImpl.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/CompanyPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/EmployeeImpl.java b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/EmployeeImpl.java
index f67bf6c..728b63d 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/impl/EmployeeImpl.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/impl/EmployeeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanyAdapterFactory.java b/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanyAdapterFactory.java
index b7cf939..600b2d0 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanyAdapterFactory.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanyAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanySwitch.java b/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanySwitch.java
index 2b45909..60e9663 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanySwitch.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanySwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanyValidator.java b/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanyValidator.java
index 17e7e92..f459458 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanyValidator.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/company/util/CompanyValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/AbstractTestSuite.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/AbstractTestSuite.java
index bebc8cf..40cc0ff 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/AbstractTestSuite.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/AbstractTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/EvaluationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/EvaluationTest.java
index 5498c98..bd18e01 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/EvaluationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/EvaluationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/OCLHelperTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/OCLHelperTest.java
index 0bb6a32..1dd2a98 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/OCLHelperTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/OCLHelperTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/ParsingTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/ParsingTest.java
index 34e08aa..f4c0255 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/ParsingTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/ParsingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/RegressionTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/RegressionTest.java
index 53a31e4..9aa9163 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/RegressionTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/RegressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/SyntaxHelpTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/SyntaxHelpTest.java
index 30585d2..d792bbe 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/SyntaxHelpTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/helper/tests/SyntaxHelpTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AbstractTestSuite.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AbstractTestSuite.java
index 3a2f021..30bcda3 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AbstractTestSuite.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AbstractTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2012, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AbstractVisitorTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AbstractVisitorTest.java
index 5ce0f4b..d0aac00 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AbstractVisitorTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AbstractVisitorTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AllTests.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AllTests.java
index c9e5d4f..f9b8482 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AllTests.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AllTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2002, 2013 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AllTestsBacktracking.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AllTestsBacktracking.java
index e53027f..ee85a9e 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AllTestsBacktracking.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AllTestsBacktracking.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AssociationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AssociationTest.java
index dff7040..ee9fac0 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AssociationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/AssociationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java
index aac08ab..b2d11a5 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/CollectionsTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/CollectionsTest.java
index 02fd7c5..17457c7 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/CollectionsTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/CollectionsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2011, 2011 IBM Corporation, Zeligsoft Inc., Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ComparisonTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ComparisonTest.java
index 47b51ad..cf00b0f 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ComparisonTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ComparisonTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DefExpressionTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DefExpressionTest.java
index 92c7b22..10848c0 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DefExpressionTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DefExpressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DelegatesTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DelegatesTest.java
index 7c5cc9a..1ee0b6a 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DelegatesTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DelegatesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DocumentationExamples.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DocumentationExamples.java
index a97df00..369edfe 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DocumentationExamples.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/DocumentationExamples.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreEnvironmentTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreEnvironmentTest.java
index 0f794fb..a996417 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreEnvironmentTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreEnvironmentTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreTestReflection.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreTestReflection.java
index bf16ee5..999946c 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreTestReflection.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreTestReflection.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreTestSuite.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreTestSuite.java
index 7ffc669..df5b6f7 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreTestSuite.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EcoreTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Bug 254919; Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationBooleanOperationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationBooleanOperationTest.java
index 74f05c7..cec1efe 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationBooleanOperationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationBooleanOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationCollectionOperationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationCollectionOperationTest.java
index 8fef62f..ce28209 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationCollectionOperationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationCollectionOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationHaltedTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationHaltedTest.java
index 16528c7..fe36a90 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationHaltedTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationHaltedTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011, 2011 Borland Software Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Radek Dvorak - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationNumberOperationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationNumberOperationTest.java
index 141d876..0fbdb9b 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationNumberOperationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationNumberOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationOclAnyOperationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationOclAnyOperationTest.java
index ad5d52b..8c3c481 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationOclAnyOperationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationOclAnyOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationStringOperationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationStringOperationTest.java
index ea24486..26e89d4 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationStringOperationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/EvaluationStringOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ExpressionsValidatorTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ExpressionsValidatorTest.java
index 5689444..101d96b 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ExpressionsValidatorTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ExpressionsValidatorTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ExtensibilityTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ExtensibilityTest.java
index f00729c..e6e7b88 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ExtensibilityTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ExtensibilityTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/FeatureRedefinitionTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/FeatureRedefinitionTest.java
index 9045868..0ca6cd8 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/FeatureRedefinitionTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/FeatureRedefinitionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2009 Stefan Schulze, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Stefan Schulze - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/InitOrDerExpressionTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/InitOrDerExpressionTest.java
index 1b044ea..ee7c936 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/InitOrDerExpressionTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/InitOrDerExpressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/InvariantConstraintsTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/InvariantConstraintsTest.java
index 5a4726f..b21e3a2 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/InvariantConstraintsTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/InvariantConstraintsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/IteratorsTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/IteratorsTest.java
index 9418222..118b760 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/IteratorsTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/IteratorsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/KeywordsTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/KeywordsTest.java
index aeb5530..dd38eb9 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/KeywordsTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/KeywordsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007,2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/LocationInformationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/LocationInformationTest.java
index f0b6d4c..c4e02fc 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/LocationInformationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/LocationInformationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/MessagesTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/MessagesTest.java
index 38181ef..93a65dc 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/MessagesTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/MessagesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/NamesTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/NamesTest.java
index b41ff14..c785ad4 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/NamesTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/NamesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *  E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OCLDocumentTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OCLDocumentTest.java
index 565c273..0451e54 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OCLDocumentTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OCLDocumentTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OCLOperationCollisionTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OCLOperationCollisionTest.java
index 5a013d2..cfb8ddc 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OCLOperationCollisionTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OCLOperationCollisionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2010 Obeo, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OperationConstraintsTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OperationConstraintsTest.java
index 6f1adb3..4f17044 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OperationConstraintsTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OperationConstraintsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011, 2017 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OppositePropertyCallExpTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OppositePropertyCallExpTest.java
index 4453d6e..b7291f1 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OppositePropertyCallExpTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/OppositePropertyCallExpTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2010 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Axel Uhl - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParserBacktrackingTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParserBacktrackingTest.java
index 5e799d1..0fd7707 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParserBacktrackingTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParserBacktrackingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParsingOptionsTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParsingOptionsTest.java
index d3a6db8..4399073 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParsingOptionsTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ParsingOptionsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 IBM Corporation, Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/PredefinedSuperTypeInheritedOperationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/PredefinedSuperTypeInheritedOperationTest.java
index 167fa59..55e8261 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/PredefinedSuperTypeInheritedOperationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/PredefinedSuperTypeInheritedOperationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2009 Borland Software Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Borland - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/PrimitiveTypesTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/PrimitiveTypesTest.java
index b679bd8..f8bb03b 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/PrimitiveTypesTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/PrimitiveTypesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2011, 2011 IBM Corporation, Zeligsoft Inc., Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ProblemOptionTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ProblemOptionTest.java
index 3d80511..4e5b455 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ProblemOptionTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ProblemOptionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/RegressionTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/RegressionTest.java
index 441043f..bb0f0c0 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/RegressionTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/RegressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2015, 2017 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/SerializationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/SerializationTest.java
index 5d21843..fe6a7cf 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/SerializationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/SerializationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/StatesTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/StatesTest.java
index cab683c..459bc1a 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/StatesTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/StatesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TuplesTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TuplesTest.java
index 8de4bd7..7f62b22 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TuplesTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TuplesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TypeConformanceTests.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TypeConformanceTests.java
index 6531f6c..edd95a4 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TypeConformanceTests.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TypeConformanceTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 Stefan Schulze, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Stefan Schulze - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TypesValidatorTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TypesValidatorTest.java
index 7bf3389..a8f296d 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TypesValidatorTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/TypesValidatorTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ValidationTest.java b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ValidationTest.java
index e709e80..e92ae37 100644
--- a/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ValidationTest.java
+++ b/tests/org.eclipse.ocl.ecore.tests/src/org/eclipse/ocl/ecore/tests/ValidationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.consumers.tests/about.html b/tests/org.eclipse.ocl.examples.consumers.tests/about.html
index 2f46c17..d75d996 100644
--- a/tests/org.eclipse.ocl.examples.consumers.tests/about.html
+++ b/tests/org.eclipse.ocl.examples.consumers.tests/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" 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.ocl.examples.consumers.tests/build.properties b/tests/org.eclipse.ocl.examples.consumers.tests/build.properties
index afdcdb1..f4f210a 100644
--- a/tests/org.eclipse.ocl.examples.consumers.tests/build.properties
+++ b/tests/org.eclipse.ocl.examples.consumers.tests/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.consumers.tests/plugin.properties b/tests/org.eclipse.ocl.examples.consumers.tests/plugin.properties
index 75b997d..a011af6 100644
--- a/tests/org.eclipse.ocl.examples.consumers.tests/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.consumers.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/AllConsumerTests.java b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/AllConsumerTests.java
index 0cc2f77..7cd1966 100644
--- a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/AllConsumerTests.java
+++ b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/AllConsumerTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerLoadTests.java b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerLoadTests.java
index 7dfe0ae..eac3b1a 100644
--- a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerLoadTests.java
+++ b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerLoadTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerProjectMapTest.java b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerProjectMapTest.java
index b5a8414..bbeb666 100644
--- a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerProjectMapTest.java
+++ b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerProjectMapTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerValidateTests.java b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerValidateTests.java
index 22544c8..bc0c169 100644
--- a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerValidateTests.java
+++ b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/ConsumerValidateTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (CEA LIST) - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/models/ConsumersModels.java b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/models/ConsumersModels.java
index eede04c..7d633c8 100644
--- a/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/models/ConsumersModels.java
+++ b/tests/org.eclipse.ocl.examples.consumers.tests/src/org/eclipse/ocl/examples/consumers/tests/models/ConsumersModels.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/about.html b/tests/org.eclipse.ocl.examples.eventmanager.tests/about.html
index e02cb11..a22e307 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/about.html
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.examples.eventmanager.tests/build.properties b/tests/org.eclipse.ocl.examples.eventmanager.tests/build.properties
index 51c9be8..3334a8e 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/build.properties
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/build.properties
@@ -1,9 +1,9 @@
 ###########################################################################
 # Copyright (c) 2009, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/plugin.properties b/tests/org.eclipse.ocl.examples.eventmanager.tests/plugin.properties
index 1b3c4ff..31375ee 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerAllTests.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerAllTests.java
index 0ae17ca..ad3d504 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerAllTests.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerAllTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerTest.java
index 62ae4de..229fd3d 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerTests.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerTests.java
index 148741e..300d40c 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerTests.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/EventManagerTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/LogicalFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/LogicalFilterTest.java
index 188f58b..fbb73fa 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/LogicalFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/LogicalFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/SimpleFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/SimpleFilterTest.java
index 9e35220..4157c99 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/SimpleFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/SimpleFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AndFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AndFilterTest.java
index 0444f32..7dd4277 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AndFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AndFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AssociationFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AssociationFilterTest.java
index 4485514..67f2a89 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AssociationFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AssociationFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AttributeFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AttributeFilterTest.java
index 787c85b..787b87f 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AttributeFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/AttributeFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/ClassFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/ClassFilterTest.java
index a888a80..c7324b6 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/ClassFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/ClassFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/ContainmentFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/ContainmentFilterTest.java
index a18e64e..cff00be 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/ContainmentFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/ContainmentFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/EventFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/EventFilterTest.java
index 77e1653..2f82d0a 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/EventFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/EventFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/EventTypeFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/EventTypeFilterTest.java
index a8bce5e..a585bf7 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/EventTypeFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/EventTypeFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/FalseFilter.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/FalseFilter.java
index 6a04c17..da12b83 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/FalseFilter.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/FalseFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/LogicalEventFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/LogicalEventFilterTest.java
index 8abd365..3b2336a 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/LogicalEventFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/LogicalEventFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/NewValueClassFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/NewValueClassFilterTest.java
index 8e038b4..c4efe32 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/NewValueClassFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/NewValueClassFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/NewValueClassIncludingSubclassesFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/NewValueClassIncludingSubclassesFilterTest.java
index 8ff722a..f7449a9 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/NewValueClassIncludingSubclassesFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/NewValueClassIncludingSubclassesFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OldValueClassFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OldValueClassFilterTest.java
index 4dc3fca..8385105 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OldValueClassFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OldValueClassFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OldValueClassIncludingSubclassesFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OldValueClassIncludingSubclassesFilterTest.java
index 9efdb13..0849884 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OldValueClassIncludingSubclassesFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OldValueClassIncludingSubclassesFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OrFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OrFilterTest.java
index 41899e8..a7321ed 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OrFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/OrFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/StructuralFeatureFilterTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/StructuralFeatureFilterTest.java
index efe92b2..fdbae89 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/StructuralFeatureFilterTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/StructuralFeatureFilterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/TrueFilter.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/TrueFilter.java
index 3355b50..a3ebc87 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/TrueFilter.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/filters/TrueFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/CompositeSetTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/CompositeSetTest.java
index 041f88f..972febb 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/CompositeSetTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/CompositeSetTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/EventManagerFactoryImplTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/EventManagerFactoryImplTest.java
index 5b8790b..362b148 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/EventManagerFactoryImplTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/EventManagerFactoryImplTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/IncludeSubclassesTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/IncludeSubclassesTest.java
index 52c89fd..88b0da3 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/IncludeSubclassesTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/IncludeSubclassesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/RecursiveContaimentNotificationCreatorTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/RecursiveContaimentNotificationCreatorTest.java
index f0b1e98..5de1a03 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/RecursiveContaimentNotificationCreatorTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/framework/RecursiveContaimentNotificationCreatorTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/util/BaseTest.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/util/BaseTest.java
index 20c22f8..06be083 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/util/BaseTest.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/util/BaseTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/util/EventManagerHelper.java b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/util/EventManagerHelper.java
index c80a478..0ed1583 100644
--- a/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/util/EventManagerHelper.java
+++ b/tests/org.eclipse.ocl.examples.eventmanager.tests/src/org/eclipse/ocl/examples/eventmanager/tests/util/EventManagerHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/about.html b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/about.html
index e02cb11..a22e307 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/about.html
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.examples.impactanalyzer.testmodel.company/build.properties b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/build.properties
index 1a550af..2382dfa 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/build.properties
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/plugin.properties b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/plugin.properties
index 617e8ec..98c05a1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Company.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Company.java
index d7b7a62..8425955 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Company.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Company.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/CompanyFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/CompanyFactory.java
index 9ef6761..0f5c5d6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/CompanyFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/CompanyFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/CompanyPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/CompanyPackage.java
index 348fd2b..27e3c96 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/CompanyPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/CompanyPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Department.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Department.java
index 644cc84..aac0bd9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Department.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Department.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Division.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Division.java
index fcf705d..ff21ed3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Division.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Division.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Employee.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Employee.java
index d8b3e51..7f63379 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Employee.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Employee.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Freelance.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Freelance.java
index 2fcbf6d..8ca8d88 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Freelance.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Freelance.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Student.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Student.java
index a59c027..9b2d10a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Student.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/Student.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyFactoryImpl.java
index cc34795..717f13c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyImpl.java
index f79058c..1959f28 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyPackageImpl.java
index 29f91c3..7263a24 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/CompanyPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/DepartmentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/DepartmentImpl.java
index 0c6b9b0..2aab62c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/DepartmentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/DepartmentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/DivisionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/DivisionImpl.java
index 820bde3..66d716b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/DivisionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/DivisionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/EmployeeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/EmployeeImpl.java
index 8809693..3386df3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/EmployeeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/EmployeeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/FreelanceImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/FreelanceImpl.java
index f0f6424..789e257 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/FreelanceImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/FreelanceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/StudentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/StudentImpl.java
index d9844de..c587372 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/StudentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/impl/StudentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanyAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanyAdapterFactory.java
index d20d496..80f73d0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanyAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanyAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanySwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanySwitch.java
index e23d7ff..cd12536 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanySwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanySwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanyValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanyValidator.java
index 7eaa89a..f6cf0a5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanyValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/company/util/CompanyValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/PrimitivetypesFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/PrimitivetypesFactory.java
index 78ead94..3085986 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/PrimitivetypesFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/PrimitivetypesFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/PrimitivetypesPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/PrimitivetypesPackage.java
index 559b594..7d4c58d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/PrimitivetypesPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/PrimitivetypesPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/impl/PrimitivetypesFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/impl/PrimitivetypesFactoryImpl.java
index 1d373ce..5f90676 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/impl/PrimitivetypesFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/impl/PrimitivetypesFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/impl/PrimitivetypesPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/impl/PrimitivetypesPackageImpl.java
index 3527bb4..b074d02 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/impl/PrimitivetypesPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.company/src/primitivetypes/impl/PrimitivetypesPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/about.html b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/about.html
index e02cb11..a22e307 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/about.html
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.examples.impactanalyzer.testmodel.ngpm/build.properties b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/build.properties
index 0eb063c..fbdd8f6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/build.properties
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/plugin.properties b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/plugin.properties
index 514f6a5..e90f237 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapAssociationEndImplementationAnnotation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapAssociationEndImplementationAnnotation.java
index 61d382d..f101e22 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapAssociationEndImplementationAnnotation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapAssociationEndImplementationAnnotation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapAssociationImplementationAnnotation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapAssociationImplementationAnnotation.java
index d4e6f46..aab0229 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapAssociationImplementationAnnotation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapAssociationImplementationAnnotation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapClassImplementationAnnotation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapClassImplementationAnnotation.java
index 6ddb9ee..e39c6f7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapClassImplementationAnnotation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapClassImplementationAnnotation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapClassKind.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapClassKind.java
index e2f986a..0d2feb3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapClassKind.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapClassKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapSignatureImplementationAnnotation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapSignatureImplementationAnnotation.java
index 5600271..ea19311 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapSignatureImplementationAnnotation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapSignatureImplementationAnnotation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapSignatureKind.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapSignatureKind.java
index c9911b3..0d90e15 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapSignatureKind.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapSignatureKind.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapmappingFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapmappingFactory.java
index 3960eed..0d51915 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapmappingFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapmappingFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapmappingPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapmappingPackage.java
index 553a15e..508e3df 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapmappingPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/AbapmappingPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapPrimtiveType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapPrimtiveType.java
index d7dc25f..2fd6b2e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapPrimtiveType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapPrimtiveType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapStructureField.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapStructureField.java
index aa03600..fe34bcb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapStructureField.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapStructureField.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapStructureType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapStructureType.java
index 9e8b7ab..e9a5404 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapStructureType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapStructureType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapType.java
index 2fe206f..f9ac7e0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapdictionaryFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapdictionaryFactory.java
index 958730a..f229205 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapdictionaryFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapdictionaryFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapdictionaryPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapdictionaryPackage.java
index bb8f13d..eb15d4c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapdictionaryPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/AbapdictionaryPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/Code.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/Code.java
index 6ee572d..01dd4c5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/Code.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/Code.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/CodeValue.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/CodeValue.java
index 3808229..c4d16be 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/CodeValue.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/CodeValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/DataElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/DataElement.java
index 06c92cd..caa24d7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/DataElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/DataElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/UnstructuredAbapType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/UnstructuredAbapType.java
index e1b4f30..c288983 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/UnstructuredAbapType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/UnstructuredAbapType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/XsdType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/XsdType.java
index 5791609..619c199 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/XsdType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/XsdType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapPrimtiveTypeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapPrimtiveTypeImpl.java
index 5f41fda..1f53c3e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapPrimtiveTypeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapPrimtiveTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapStructureFieldImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapStructureFieldImpl.java
index 21aa389..6adb7d0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapStructureFieldImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapStructureFieldImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapStructureTypeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapStructureTypeImpl.java
index a7c4409..119d06a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapStructureTypeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapStructureTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapTypeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapTypeImpl.java
index 9d0970f..e5ef2ad 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapTypeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapdictionaryFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapdictionaryFactoryImpl.java
index 8f6c174..15a3c11 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapdictionaryFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapdictionaryFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapdictionaryPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapdictionaryPackageImpl.java
index b68b398..e502af8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapdictionaryPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/AbapdictionaryPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/CodeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/CodeImpl.java
index 4c32f9c..357161c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/CodeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/CodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/CodeValueImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/CodeValueImpl.java
index fa721f5..44cfef5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/CodeValueImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/CodeValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/DataElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/DataElementImpl.java
index d830da5..7c89c7a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/DataElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/DataElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/UnstructuredAbapTypeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/UnstructuredAbapTypeImpl.java
index 8ac2f0a..eee962e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/UnstructuredAbapTypeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/UnstructuredAbapTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/XsdTypeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/XsdTypeImpl.java
index 8055bec..90d9330 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/XsdTypeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/impl/XsdTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionaryAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionaryAdapterFactory.java
index 1bcc5c0..0ffc4d2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionaryAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionaryAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionarySwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionarySwitch.java
index 26f91b8..85831fc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionarySwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionarySwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionaryValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionaryValidator.java
index 99e5324..825d34a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionaryValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/abapdictionary/util/AbapdictionaryValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapAssociationEndImplementationAnnotationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapAssociationEndImplementationAnnotationImpl.java
index 71f29ed..0e47a66 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapAssociationEndImplementationAnnotationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapAssociationEndImplementationAnnotationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapAssociationImplementationAnnotationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapAssociationImplementationAnnotationImpl.java
index 84c1550..ef13bed 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapAssociationImplementationAnnotationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapAssociationImplementationAnnotationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapClassImplementationAnnotationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapClassImplementationAnnotationImpl.java
index 787000c..2e680c6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapClassImplementationAnnotationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapClassImplementationAnnotationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapSignatureImplementationAnnotationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapSignatureImplementationAnnotationImpl.java
index 42cf76f..4e06491 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapSignatureImplementationAnnotationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapSignatureImplementationAnnotationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapmappingFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapmappingFactoryImpl.java
index b013360..f6900d4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapmappingFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapmappingFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapmappingPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapmappingPackageImpl.java
index 039cabb..547d749 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapmappingPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/impl/AbapmappingPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingAdapterFactory.java
index 9cf4cc7..497a0f0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingSwitch.java
index e168ff4..db47f8c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingValidator.java
index aed286b..e8505a9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/abapmapping/util/AbapmappingValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/Ap_runtime_constraintsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/Ap_runtime_constraintsFactory.java
index 884ade8..6969d23 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/Ap_runtime_constraintsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/Ap_runtime_constraintsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/Ap_runtime_constraintsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/Ap_runtime_constraintsPackage.java
index c417c97..8c3c67f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/Ap_runtime_constraintsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/Ap_runtime_constraintsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/QueryConstraint.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/QueryConstraint.java
index 8ff2446..222a2a6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/QueryConstraint.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/QueryConstraint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/Ap_runtime_constraintsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/Ap_runtime_constraintsFactoryImpl.java
index c9e9526..d4d6e6a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/Ap_runtime_constraintsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/Ap_runtime_constraintsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/Ap_runtime_constraintsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/Ap_runtime_constraintsPackageImpl.java
index eec43c7..9b51c25 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/Ap_runtime_constraintsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/Ap_runtime_constraintsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/QueryConstraintImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/QueryConstraintImpl.java
index 467df44..71ea4e9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/QueryConstraintImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/impl/QueryConstraintImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/util/Ap_runtime_constraintsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/util/Ap_runtime_constraintsAdapterFactory.java
index 0b8657a..7b5f4ae 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/util/Ap_runtime_constraintsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/util/Ap_runtime_constraintsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/util/Ap_runtime_constraintsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/util/Ap_runtime_constraintsSwitch.java
index 400563f..9540e78 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/util/Ap_runtime_constraintsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ap_runtime_constraints/util/Ap_runtime_constraintsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ActionsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ActionsFactory.java
index 193a0aa..ac6e919 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ActionsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ActionsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ActionsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ActionsPackage.java
index 4d66fd8..19e2116 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ActionsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ActionsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/AddLink.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/AddLink.java
index ee998ce..388aad3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/AddLink.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/AddLink.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Assignment.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Assignment.java
index 37ef7e1..843d84c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Assignment.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Assignment.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Block.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Block.java
index 0ecdf4c..7bdcc05 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Block.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Block.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ConditionalStatement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ConditionalStatement.java
index b33f7e9..851be32 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ConditionalStatement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ConditionalStatement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Constant.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Constant.java
index f0838c4..8e5e21c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Constant.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Constant.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ExpressionStatement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ExpressionStatement.java
index 6b3b638..f7707a7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ExpressionStatement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/ExpressionStatement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Foreach.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Foreach.java
index e1f7017..22992c9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Foreach.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Foreach.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/IfElse.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/IfElse.java
index 0364405..585cf53 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/IfElse.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/IfElse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Iterator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Iterator.java
index e484acc..d92b6f0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Iterator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Iterator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/LinkManipulationStatement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/LinkManipulationStatement.java
index 377cc15..4b508dc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/LinkManipulationStatement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/LinkManipulationStatement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/NamedValueDeclaration.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/NamedValueDeclaration.java
index 1cf580b..3314f08 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/NamedValueDeclaration.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/NamedValueDeclaration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/NamedValueWithOptionalInitExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/NamedValueWithOptionalInitExpression.java
index 9739743..45ddf23 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/NamedValueWithOptionalInitExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/NamedValueWithOptionalInitExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/QueryInvocation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/QueryInvocation.java
index f0b4721..bbb8b01 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/QueryInvocation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/QueryInvocation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/RemoveLink.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/RemoveLink.java
index e99cfd0..17c39e5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/RemoveLink.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/RemoveLink.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Return.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Return.java
index 342039f..f3a9b9d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Return.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Return.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/SingleBlockStatement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/SingleBlockStatement.java
index 0cae247..75d016c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/SingleBlockStatement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/SingleBlockStatement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Sort.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Sort.java
index 48b596d..9a6730b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Sort.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Sort.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Statement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Statement.java
index 3d4b8b7..77fcf05 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Statement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Statement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/StatementWithArgument.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/StatementWithArgument.java
index d2a7314..c9bbe88 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/StatementWithArgument.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/StatementWithArgument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/StatementWithNestedBlocks.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/StatementWithNestedBlocks.java
index 181fd9e..7438711 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/StatementWithNestedBlocks.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/StatementWithNestedBlocks.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Variable.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Variable.java
index 2576e7f..b85edaf 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Variable.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/Variable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/WhileLoop.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/WhileLoop.java
index 782c3ab..de8fd31 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/WhileLoop.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/WhileLoop.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ActionsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ActionsFactoryImpl.java
index b8b3b29..c778750 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ActionsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ActionsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ActionsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ActionsPackageImpl.java
index aea170d..1d05bc8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ActionsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ActionsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/AddLinkImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/AddLinkImpl.java
index cb1196a..794b94a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/AddLinkImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/AddLinkImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/AssignmentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/AssignmentImpl.java
index a4c1395..fc571ce 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/AssignmentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/AssignmentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/BlockImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/BlockImpl.java
index 162b133..c40f24d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/BlockImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/BlockImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ConditionalStatementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ConditionalStatementImpl.java
index c21b83b..b078d35 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ConditionalStatementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ConditionalStatementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ConstantImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ConstantImpl.java
index 5802546..8629262 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ConstantImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ConstantImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ExpressionStatementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ExpressionStatementImpl.java
index b52abed..96dd898 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ExpressionStatementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ExpressionStatementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ForeachImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ForeachImpl.java
index 48a0bbc..b61adeb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ForeachImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ForeachImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/IfElseImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/IfElseImpl.java
index a99ef4d..8fecce1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/IfElseImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/IfElseImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/IteratorImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/IteratorImpl.java
index 2b72776..b38b019 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/IteratorImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/IteratorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/LinkManipulationStatementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/LinkManipulationStatementImpl.java
index 9a80bef..b142b0e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/LinkManipulationStatementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/LinkManipulationStatementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/NamedValueDeclarationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/NamedValueDeclarationImpl.java
index 7ccaea6..4c9e4ac 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/NamedValueDeclarationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/NamedValueDeclarationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/NamedValueWithOptionalInitExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/NamedValueWithOptionalInitExpressionImpl.java
index 17dcfa5..9898ae5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/NamedValueWithOptionalInitExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/NamedValueWithOptionalInitExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/QueryInvocationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/QueryInvocationImpl.java
index 20cd166..18834b5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/QueryInvocationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/QueryInvocationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/RemoveLinkImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/RemoveLinkImpl.java
index 0417254..a7f33cc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/RemoveLinkImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/RemoveLinkImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ReturnImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ReturnImpl.java
index 6b40590..e5629f7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ReturnImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/ReturnImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/SingleBlockStatementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/SingleBlockStatementImpl.java
index d57348c..6cf2a2c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/SingleBlockStatementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/SingleBlockStatementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/SortImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/SortImpl.java
index 1ad5431..e83fff0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/SortImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/SortImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementImpl.java
index 6c639ac..4aad08e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementWithArgumentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementWithArgumentImpl.java
index 26eaf01..6cedbca 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementWithArgumentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementWithArgumentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementWithNestedBlocksImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementWithNestedBlocksImpl.java
index 60c2700..6feb90f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementWithNestedBlocksImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/StatementWithNestedBlocksImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/VariableImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/VariableImpl.java
index d0b126a..078ae0e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/VariableImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/VariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/WhileLoopImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/WhileLoopImpl.java
index 2643bcf..4ffc94c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/WhileLoopImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/impl/WhileLoopImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsAdapterFactory.java
index ce61839..a4bef8f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsSwitch.java
index 2773332..59b4dbe 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsValidator.java
index 48d4384..546d68c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/actions/util/ActionsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/BpdmFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/BpdmFactory.java
index eed366f..31347a2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/BpdmFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/BpdmFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/BpdmPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/BpdmPackage.java
index e4367f6..7880f86 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/BpdmPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/BpdmPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/Dummy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/Dummy.java
index 6fc8498..56ee2ec 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/Dummy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/Dummy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/BpdmFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/BpdmFactoryImpl.java
index 75fb85d..7be171f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/BpdmFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/BpdmFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/BpdmPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/BpdmPackageImpl.java
index 1a4bed0..6482496 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/BpdmPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/BpdmPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/DummyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/DummyImpl.java
index 5b2f28c..58de177 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/DummyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/impl/DummyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/util/BpdmAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/util/BpdmAdapterFactory.java
index c25a920..ea0f72d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/util/BpdmAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/util/BpdmAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/util/BpdmSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/util/BpdmSwitch.java
index 24c32ac..29269a2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/util/BpdmSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/bpdm/util/BpdmSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/BusinesstasksFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/BusinesstasksFactory.java
index cb12fa8..9f1d373 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/BusinesstasksFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/BusinesstasksFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/BusinesstasksPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/BusinesstasksPackage.java
index 981180f..4afc67a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/BusinesstasksPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/BusinesstasksPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/TaskAgent.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/TaskAgent.java
index f85db16..0bb22c2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/TaskAgent.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/TaskAgent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/BusinesstasksFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/BusinesstasksFactoryImpl.java
index 3f5a61f..e02ec5c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/BusinesstasksFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/BusinesstasksFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/BusinesstasksPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/BusinesstasksPackageImpl.java
index 4395c65..d88ce0c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/BusinesstasksPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/BusinesstasksPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/TaskAgentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/TaskAgentImpl.java
index 12fec7a..7ec4359 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/TaskAgentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/impl/TaskAgentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/util/BusinesstasksAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/util/BusinesstasksAdapterFactory.java
index 9495fdf..bd35599 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/util/BusinesstasksAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/util/BusinesstasksAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/util/BusinesstasksSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/util/BusinesstasksSwitch.java
index 4635bf6..531dd27 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/util/BusinesstasksSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/businesstasks/util/BusinesstasksSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventFilter.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventFilter.java
index 7507ad1..70c012c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventFilter.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventFilter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventProducer.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventProducer.java
index 2b514d2..fe7992b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventProducer.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventProducer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventsFactory.java
index 24ff871..e146f88 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventsPackage.java
index ccd832e..4ad0242 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/EventsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/Subscription.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/Subscription.java
index d0978da..a0d607f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/Subscription.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/Subscription.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventFilterImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventFilterImpl.java
index fcb58e4..f62f772 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventFilterImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventFilterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventProducerImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventProducerImpl.java
index bbea648..e9c68d2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventProducerImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventProducerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventsFactoryImpl.java
index e72ce3e..b6b3f05 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventsPackageImpl.java
index d587d4e..baed746 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/EventsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/SubscriptionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/SubscriptionImpl.java
index 6ff6f83..e73c3c8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/SubscriptionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/impl/SubscriptionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsAdapterFactory.java
index 313ef15..0a4d864 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsSwitch.java
index f8f72a5..0d797a1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsValidator.java
index 3c6df9c..841d409 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/events/util/EventsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/Dummy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/Dummy.java
index c98bade..322a566 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/Dummy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/Dummy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/RulesFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/RulesFactory.java
index 58a1850..05deb2e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/RulesFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/RulesFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/RulesPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/RulesPackage.java
index 3cd8959..e118bfd 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/RulesPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/RulesPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/DummyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/DummyImpl.java
index dabfda0..ad3248c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/DummyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/DummyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/RulesFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/RulesFactoryImpl.java
index fa54bab..51c47ea 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/RulesFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/RulesFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/RulesPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/RulesPackageImpl.java
index 48c2287..03c4aeb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/RulesPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/impl/RulesPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/util/RulesAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/util/RulesAdapterFactory.java
index ffdd1ac..6accc9f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/util/RulesAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/util/RulesAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/util/RulesSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/util/RulesSwitch.java
index 7b7036f..6ad1a0e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/util/RulesSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/rules/util/RulesSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/ActionProxy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/ActionProxy.java
index d904abf..748f98d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/ActionProxy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/ActionProxy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AndOperator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AndOperator.java
index 7c217f8..284773b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AndOperator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AndOperator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AssemblyFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AssemblyFactory.java
index b743bd8..1ac4268 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AssemblyFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AssemblyFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AssemblyPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AssemblyPackage.java
index 0ae463d..ca66382 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AssemblyPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/AssemblyPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/ConnectableElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/ConnectableElement.java
index 657a2a9..5adc61c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/ConnectableElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/ConnectableElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Connector.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Connector.java
index 1b994cc..47bfd62 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Connector.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Connector.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/EnablingStrategy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/EnablingStrategy.java
index 556d901..e3ce3d8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/EnablingStrategy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/EnablingStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/InhibitingStrategy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/InhibitingStrategy.java
index d33ce90..11ac46c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/InhibitingStrategy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/InhibitingStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/NeutralStrategy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/NeutralStrategy.java
index f20ebf6..610c113 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/NeutralStrategy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/NeutralStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Operator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Operator.java
index c2001ae..4bcca4f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Operator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Operator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/OrOperator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/OrOperator.java
index 7ab8303..939d947 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/OrOperator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/OrOperator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Precondition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Precondition.java
index 0cdb3c0..7e54ac3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Precondition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Precondition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/RequiredStrategy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/RequiredStrategy.java
index d018d0b..b8923bf 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/RequiredStrategy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/RequiredStrategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/SchemaElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/SchemaElement.java
index 3155bcb..12d2eb6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/SchemaElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/SchemaElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusSchema.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusSchema.java
index 21e1d03..84a30ec 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusSchema.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusSchema.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusValueProxy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusValueProxy.java
index 7ecd3d3..908c7f0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusValueProxy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusValueProxy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusVariableProxy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusVariableProxy.java
index ab6a30a..190a093 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusVariableProxy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/StatusVariableProxy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Strategy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Strategy.java
index f4949d3..59384e7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Strategy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Strategy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Synchroniser.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Synchroniser.java
index 51bfc8e..9855d53 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Synchroniser.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Synchroniser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Transition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Transition.java
index e390e6b..8028e13 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Transition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/Transition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ActionProxyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ActionProxyImpl.java
index 193d829..41ec537 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ActionProxyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ActionProxyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AndOperatorImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AndOperatorImpl.java
index 8629b06..c2b5052 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AndOperatorImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AndOperatorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AssemblyFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AssemblyFactoryImpl.java
index a41b6ee..c1572e3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AssemblyFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AssemblyFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AssemblyPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AssemblyPackageImpl.java
index d019179..7aa5ac0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AssemblyPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/AssemblyPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ConnectableElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ConnectableElementImpl.java
index 3fd81ac..b7d1b6a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ConnectableElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ConnectableElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ConnectorImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ConnectorImpl.java
index 4b6dc44..f99646a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ConnectorImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/ConnectorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/EnablingStrategyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/EnablingStrategyImpl.java
index c4b2ea4..a234331 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/EnablingStrategyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/EnablingStrategyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/InhibitingStrategyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/InhibitingStrategyImpl.java
index 77df2e6..09758f1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/InhibitingStrategyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/InhibitingStrategyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/NeutralStrategyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/NeutralStrategyImpl.java
index 3c8d711..4a12cd2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/NeutralStrategyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/NeutralStrategyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/OperatorImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/OperatorImpl.java
index ead0c49..135ca9b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/OperatorImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/OperatorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/OrOperatorImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/OrOperatorImpl.java
index 13fd105..a7a26ea 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/OrOperatorImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/OrOperatorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/PreconditionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/PreconditionImpl.java
index 6faf16f..cbf7968 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/PreconditionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/PreconditionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/RequiredStrategyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/RequiredStrategyImpl.java
index 729f426..4fcb2e8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/RequiredStrategyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/RequiredStrategyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/SchemaElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/SchemaElementImpl.java
index ea0c3cf..6214869 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/SchemaElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/SchemaElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusSchemaImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusSchemaImpl.java
index 3c08f29..98dadc9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusSchemaImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusSchemaImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusValueProxyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusValueProxyImpl.java
index 8e43ea9..ec81834 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusValueProxyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusValueProxyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusVariableProxyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusVariableProxyImpl.java
index 32af407..9ed0717 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusVariableProxyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StatusVariableProxyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StrategyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StrategyImpl.java
index 539986f..3cd3624 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StrategyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/StrategyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/SynchroniserImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/SynchroniserImpl.java
index 42d68b1..d48c88e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/SynchroniserImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/SynchroniserImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/TransitionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/TransitionImpl.java
index 56f796b..030efbc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/TransitionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/impl/TransitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/util/AssemblyAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/util/AssemblyAdapterFactory.java
index 73d7938..01e2e57 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/util/AssemblyAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/util/AssemblyAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/util/AssemblySwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/util/AssemblySwitch.java
index 0b24f26..858ef67 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/util/AssemblySwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/assembly/util/AssemblySwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractAction.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractAction.java
index a111106..81f6829 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractAction.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractStatusValue.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractStatusValue.java
index d22e810..e0e4a99 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractStatusValue.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractStatusValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractStatusVariable.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractStatusVariable.java
index bf6ece1..2836c2a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractStatusVariable.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/AbstractStatusVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/Action.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/Action.java
index 923b2bb..1e5a58d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/Action.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/Action.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/BusinessObject.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/BusinessObject.java
index b5090c2..cb04156 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/BusinessObject.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/BusinessObject.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/BusinessObjectNode.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/BusinessObjectNode.java
index d9ea11e..b627fbe 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/BusinessObjectNode.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/BusinessObjectNode.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/DesignFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/DesignFactory.java
index 9923518..bd525b9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/DesignFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/DesignFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/DesignPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/DesignPackage.java
index 270173f..e4e2242 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/DesignPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/DesignPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/StatusValue.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/StatusValue.java
index 9372c3b..2bed774 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/StatusValue.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/StatusValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/StatusVariable.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/StatusVariable.java
index 9bffca5..a0d3a6f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/StatusVariable.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/StatusVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractActionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractActionImpl.java
index a6662bb..9df8303 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractActionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractActionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractStatusValueImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractStatusValueImpl.java
index d25a2d5..1fd3805 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractStatusValueImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractStatusValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractStatusVariableImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractStatusVariableImpl.java
index 0ce0f50..739100d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractStatusVariableImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/AbstractStatusVariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/ActionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/ActionImpl.java
index 3e1aaf2..00b02e7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/ActionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/ActionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/BusinessObjectImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/BusinessObjectImpl.java
index 419ce27..dbb5389 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/BusinessObjectImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/BusinessObjectImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/BusinessObjectNodeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/BusinessObjectNodeImpl.java
index ee8c4f5..1c30b3a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/BusinessObjectNodeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/BusinessObjectNodeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/DesignFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/DesignFactoryImpl.java
index 210d998..96171c9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/DesignFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/DesignFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/DesignPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/DesignPackageImpl.java
index 07604c3..8427de2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/DesignPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/DesignPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/StatusValueImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/StatusValueImpl.java
index d55bf68..74d1fce 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/StatusValueImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/StatusValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/StatusVariableImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/StatusVariableImpl.java
index dc931ef..015229a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/StatusVariableImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/impl/StatusVariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/util/DesignAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/util/DesignAdapterFactory.java
index ab6297b..004ebdb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/util/DesignAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/util/DesignAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/util/DesignSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/util/DesignSwitch.java
index d6ae61d..c77ea51 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/util/DesignSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action/design/util/DesignSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/PreconditionKindEnum.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/PreconditionKindEnum.java
index c608b3a..3570db2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/PreconditionKindEnum.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/PreconditionKindEnum.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMAction.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMAction.java
index 4f5b117..dcc2ef9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMAction.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMDerivator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMDerivator.java
index 3ca09da..09ef49c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMDerivator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMDerivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMDerivatorKindEnum.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMDerivatorKindEnum.java
index c99a5aa..8d9455f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMDerivatorKindEnum.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMDerivatorKindEnum.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMOperator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMOperator.java
index 2c5492f..64185bd 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMOperator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMOperator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMOperatorKindEnum.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMOperatorKindEnum.java
index 701833f..6fdfbc4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMOperatorKindEnum.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMOperatorKindEnum.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaAction.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaAction.java
index 487a70b..d032c4d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaAction.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaAction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaDerivator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaDerivator.java
index bb71571..2ef6da4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaDerivator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaDerivator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaValue.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaValue.java
index 2666fd4..34e6d5c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaValue.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaVariable.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaVariable.java
index 135edfa..584cd93 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaVariable.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMSchemaVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusSchema.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusSchema.java
index 193aacc..9e2534b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusSchema.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusSchema.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusValue.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusValue.java
index 92f373e..28cda65 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusValue.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusVariable.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusVariable.java
index 66ca0ba..3de29c9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusVariable.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/SAMStatusVariable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/Status_and_action_oldFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/Status_and_action_oldFactory.java
index a260b80..8572c25 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/Status_and_action_oldFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/Status_and_action_oldFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/Status_and_action_oldPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/Status_and_action_oldPackage.java
index 1d396e0..3013fd4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/Status_and_action_oldPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/Status_and_action_oldPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMActionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMActionImpl.java
index 1dfde69..368049b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMActionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMActionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMDerivatorImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMDerivatorImpl.java
index 03661b8..1d5acf5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMDerivatorImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMDerivatorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMOperatorImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMOperatorImpl.java
index 3eabb23..1fdd8a8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMOperatorImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMOperatorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaActionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaActionImpl.java
index 3245742..43cd91e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaActionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaActionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaDerivatorImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaDerivatorImpl.java
index 2795dad..28444ca 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaDerivatorImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaDerivatorImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaValueImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaValueImpl.java
index 161d3d7..1544903 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaValueImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaVariableImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaVariableImpl.java
index d230bd4..60eabec 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaVariableImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMSchemaVariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusSchemaImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusSchemaImpl.java
index de80102..6ef467a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusSchemaImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusSchemaImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusValueImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusValueImpl.java
index c21f735..62a1ab0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusValueImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusVariableImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusVariableImpl.java
index 6746563..c8a2e9a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusVariableImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/SAMStatusVariableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/Status_and_action_oldFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/Status_and_action_oldFactoryImpl.java
index 13fccda..6f7ccfc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/Status_and_action_oldFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/Status_and_action_oldFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/Status_and_action_oldPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/Status_and_action_oldPackageImpl.java
index 519a9ad..efbb1bc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/Status_and_action_oldPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/impl/Status_and_action_oldPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/util/Status_and_action_oldAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/util/Status_and_action_oldAdapterFactory.java
index 4d2f3e9..9bc36f7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/util/Status_and_action_oldAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/util/Status_and_action_oldAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/util/Status_and_action_oldSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/util/Status_and_action_oldSwitch.java
index fd473c6..a6214d3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/util/Status_and_action_oldSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/status_and_action_old/util/Status_and_action_oldSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/Dummy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/Dummy.java
index b56bea4..052a779 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/Dummy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/Dummy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/TransactionsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/TransactionsFactory.java
index d133e34..ce48925 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/TransactionsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/TransactionsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/TransactionsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/TransactionsPackage.java
index f5dda71..51b0760 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/TransactionsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/TransactionsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/DummyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/DummyImpl.java
index c405d0c..ec93f1d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/DummyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/DummyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/TransactionsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/TransactionsFactoryImpl.java
index d2c6280..efaf045 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/TransactionsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/TransactionsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/TransactionsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/TransactionsPackageImpl.java
index dc211f3..b1c8212 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/TransactionsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/impl/TransactionsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/util/TransactionsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/util/TransactionsAdapterFactory.java
index 4bf7905..a1ffa2b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/util/TransactionsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/util/TransactionsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/util/TransactionsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/util/TransactionsSwitch.java
index fa79258..604b5b9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/util/TransactionsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/behavioral/transactions/util/TransactionsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessArea.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessArea.java
index 53240c4..8c0fc14 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessArea.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessArea.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessOption.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessOption.java
index f5d98f6..af81e57 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessOption.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessOption.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessPackage.java
index 43c94c6..1d7e6af 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessTopic.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessTopic.java
index c499797..40247e3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessTopic.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessTopic.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessconfigurationFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessconfigurationFactory.java
index f219e93..b373275 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessconfigurationFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessconfigurationFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessconfigurationPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessconfigurationPackage.java
index 77e4f1e..ed5bb24 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessconfigurationPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/BusinessconfigurationPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ConfigurationElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ConfigurationElement.java
index 5240fa8..8259d75 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ConfigurationElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ConfigurationElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/Country.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/Country.java
index 15a75b0..83f5c4e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/Country.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/Country.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/Industry.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/Industry.java
index 536af2d..8de57bd 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/Industry.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/Industry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ScopingContext.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ScopingContext.java
index 05a1100..6969a29 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ScopingContext.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ScopingContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ValueSet.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ValueSet.java
index 80c49cc..fae7163 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ValueSet.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ValueSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ValueSetEntry.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ValueSetEntry.java
index 3b7d756..89efea9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ValueSetEntry.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/ValueSetEntry.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ConfigurationEntity.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ConfigurationEntity.java
index bd5b942..8dfe127 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ConfigurationEntity.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ConfigurationEntity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ConfigurationSetting.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ConfigurationSetting.java
index a08ba40..b95d615 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ConfigurationSetting.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ConfigurationSetting.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ExperimentalFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ExperimentalFactory.java
index dfab6b8..1d8674d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ExperimentalFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ExperimentalFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ExperimentalPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ExperimentalPackage.java
index 3d2425a..9445e8e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ExperimentalPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/ExperimentalPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/PackageUse.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/PackageUse.java
index 05df44c..6cce952 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/PackageUse.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/PackageUse.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ConfigurationEntityImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ConfigurationEntityImpl.java
index 74bea50..328235c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ConfigurationEntityImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ConfigurationEntityImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ConfigurationSettingImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ConfigurationSettingImpl.java
index b44811c..5b65ccc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ConfigurationSettingImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ConfigurationSettingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ExperimentalFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ExperimentalFactoryImpl.java
index e7ba53d..f3dcf5c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ExperimentalFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ExperimentalFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ExperimentalPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ExperimentalPackageImpl.java
index 4a595da..ee35ebf 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ExperimentalPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/ExperimentalPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/PackageUseImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/PackageUseImpl.java
index d9bd09c..f58a93f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/PackageUseImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/impl/PackageUseImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/util/ExperimentalAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/util/ExperimentalAdapterFactory.java
index f5e6208..4101399 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/util/ExperimentalAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/util/ExperimentalAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/util/ExperimentalSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/util/ExperimentalSwitch.java
index 744d777..f30c479 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/util/ExperimentalSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/experimental/util/ExperimentalSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessAreaImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessAreaImpl.java
index 7f91ff9..3e496c0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessAreaImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessAreaImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessOptionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessOptionImpl.java
index b72ab02..50a92a3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessOptionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessOptionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessPackageImpl.java
index 798ee80..f5776d1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessTopicImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessTopicImpl.java
index b6eabbc5..91c210f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessTopicImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessTopicImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessconfigurationFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessconfigurationFactoryImpl.java
index 1b13948..07aad1b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessconfigurationFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessconfigurationFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessconfigurationPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessconfigurationPackageImpl.java
index c134506..6ca4bd7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessconfigurationPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/BusinessconfigurationPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ConfigurationElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ConfigurationElementImpl.java
index 2d14828..5c0c937 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ConfigurationElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ConfigurationElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/CountryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/CountryImpl.java
index 6e98781..0c2793e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/CountryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/CountryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/IndustryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/IndustryImpl.java
index 0b233e3..c6e22e9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/IndustryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/IndustryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ScopingContextImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ScopingContextImpl.java
index f157083..346e4af 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ScopingContextImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ScopingContextImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ValueSetEntryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ValueSetEntryImpl.java
index 3a07870..aacc9f8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ValueSetEntryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ValueSetEntryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ValueSetImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ValueSetImpl.java
index 65d1413..016f575 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ValueSetImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/impl/ValueSetImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/util/BusinessconfigurationAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/util/BusinessconfigurationAdapterFactory.java
index 99418ec..38e9cdc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/util/BusinessconfigurationAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/util/BusinessconfigurationAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/util/BusinessconfigurationSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/util/BusinessconfigurationSwitch.java
index 9e42c3d..2662c1f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/util/BusinessconfigurationSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/businessconfiguration/util/BusinessconfigurationSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContexConfiguration.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContexConfiguration.java
index c16f709..1e5196e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContexConfiguration.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContexConfiguration.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextCategory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextCategory.java
index 8a12622..6c4d332 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextCategory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextCategory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextCategoryValue.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextCategoryValue.java
index 989e103..9f36c27 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextCategoryValue.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextCategoryValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/Context_driversFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/Context_driversFactory.java
index 38b85d1..b54f2cc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/Context_driversFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/Context_driversFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/Context_driversPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/Context_driversPackage.java
index f7c11a5..24077bc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/Context_driversPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/Context_driversPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextualElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextualElement.java
index 280f007..971cec2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextualElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/ContextualElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContexConfigurationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContexConfigurationImpl.java
index 86cd32d..89ac0f8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContexConfigurationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContexConfigurationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextCategoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextCategoryImpl.java
index b766f2c..4b99969 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextCategoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextCategoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextCategoryValueImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextCategoryValueImpl.java
index 12a2614..cf7b63d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextCategoryValueImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextCategoryValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/Context_driversFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/Context_driversFactoryImpl.java
index 101a470..eb43029 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/Context_driversFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/Context_driversFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/Context_driversPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/Context_driversPackageImpl.java
index e7789fc..46cb0d9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/Context_driversPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/Context_driversPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextualElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextualElementImpl.java
index b25032f..019ec35 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextualElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/impl/ContextualElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/util/Context_driversAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/util/Context_driversAdapterFactory.java
index 6f8b433..ba15239 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/util/Context_driversAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/util/Context_driversAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/util/Context_driversSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/util/Context_driversSwitch.java
index 16a67ef..2b7eeb9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/util/Context_driversSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/configuration/context_drivers/util/Context_driversSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ActualObjectParameter.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ActualObjectParameter.java
index 5d823f7..9ab29a8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ActualObjectParameter.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ActualObjectParameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Association.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Association.java
index a20b85b..23b5493 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Association.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Association.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/AssociationEnd.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/AssociationEnd.java
index 7868944..3ada928 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/AssociationEnd.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/AssociationEnd.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/AssociationEndSignatureImplementation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/AssociationEndSignatureImplementation.java
index ae0b4c2..7df8c79 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/AssociationEndSignatureImplementation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/AssociationEndSignatureImplementation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassTypeDefinition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassTypeDefinition.java
index 13fb789..50588f8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassTypeDefinition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassTypeDefinition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassesFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassesFactory.java
index 5af8369..8aa760d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassesFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassesFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassesPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassesPackage.java
index 2554ab1..729ada1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassesPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ClassesPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Context.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Context.java
index ecd1b6f..fcd1643 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Context.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Context.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ConverterBetweenParametrizations.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ConverterBetweenParametrizations.java
index a69cb83..1421c62 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ConverterBetweenParametrizations.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ConverterBetweenParametrizations.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Delegation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Delegation.java
index 0544955..75a6442 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Delegation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Delegation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ExtentModifyingAssociationEndSignatureImplementation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ExtentModifyingAssociationEndSignatureImplementation.java
index 05f3dcf..a707429 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ExtentModifyingAssociationEndSignatureImplementation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/ExtentModifyingAssociationEndSignatureImplementation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignature.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignature.java
index 3e4f28b..455fa37 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignature.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignatureImplementation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignatureImplementation.java
index 87685bc..56fe9aa 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignatureImplementation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignatureImplementation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignatureTypeDefinition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignatureTypeDefinition.java
index 878150f..5c5cfbf 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignatureTypeDefinition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/FunctionSignatureTypeDefinition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/InScope.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/InScope.java
index c7dadd5..282c931 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/InScope.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/InScope.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkAddition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkAddition.java
index 9ca436d..16aa291 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkAddition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkAddition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkManipulationAtPosition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkManipulationAtPosition.java
index 171b381..c73a82e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkManipulationAtPosition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkManipulationAtPosition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkRemoval.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkRemoval.java
index 81c425c..28ccf94 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkRemoval.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkRemoval.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkSetting.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkSetting.java
index 05a8bf6..1d3ab8c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkSetting.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkSetting.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkTraversal.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkTraversal.java
index 44d31c2..f4cff65 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkTraversal.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/LinkTraversal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/MethodSignature.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/MethodSignature.java
index 90a034f..68956fb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/MethodSignature.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/MethodSignature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Multiplicity.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Multiplicity.java
index f71cc07..1213b85 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Multiplicity.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Multiplicity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NamedValue.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NamedValue.java
index bef9f10..205620e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NamedValue.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NamedValue.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NativeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NativeImpl.java
index d0018e0..c15ef8f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NativeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NativeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NestedTypeDefinition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NestedTypeDefinition.java
index 5e91b91..6b8f1e0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NestedTypeDefinition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/NestedTypeDefinition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Parameter.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Parameter.java
index 40e103f..935ad92 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Parameter.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Parameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/PlatformSpecificImplementation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/PlatformSpecificImplementation.java
index d948ae3..0b4ab6c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/PlatformSpecificImplementation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/PlatformSpecificImplementation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SapClass.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SapClass.java
index b65226a..5c31ab5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SapClass.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SapClass.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Signature.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Signature.java
index a9710d2..f6511c8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Signature.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/Signature.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SignatureImplementation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SignatureImplementation.java
index a2c44ec..0a9a3fc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SignatureImplementation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SignatureImplementation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SignatureOwner.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SignatureOwner.java
index 1e2647e..7f8e1c4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SignatureOwner.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/SignatureOwner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypeAdapter.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypeAdapter.java
index 0630455..e0f0864 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypeAdapter.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypeAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypeDefinition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypeDefinition.java
index 5f4df92..87083f8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypeDefinition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypeDefinition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypedElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypedElement.java
index 6da5577..591390f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypedElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/TypedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ActualObjectParameterImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ActualObjectParameterImpl.java
index d959fd8..8cf591e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ActualObjectParameterImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ActualObjectParameterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationEndImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationEndImpl.java
index da2e2da..a6d1600 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationEndImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationEndImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationEndSignatureImplementationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationEndSignatureImplementationImpl.java
index 69b33da..5f577ed 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationEndSignatureImplementationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationEndSignatureImplementationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationImpl.java
index 999958c..c7c6f09 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/AssociationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassTypeDefinitionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassTypeDefinitionImpl.java
index a8fbba2..c4c8f9b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassTypeDefinitionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassTypeDefinitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassesFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassesFactoryImpl.java
index 4a06969..a9be738 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassesFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassesFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassesPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassesPackageImpl.java
index 4f84b14..45f4079 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassesPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ClassesPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ContextImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ContextImpl.java
index 8b76dfc..db66455 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ContextImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ContextImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ConverterBetweenParametrizationsImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ConverterBetweenParametrizationsImpl.java
index bb001e8..0a00331 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ConverterBetweenParametrizationsImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ConverterBetweenParametrizationsImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/DelegationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/DelegationImpl.java
index 4249d88..58883da 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/DelegationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/DelegationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ExtentModifyingAssociationEndSignatureImplementationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ExtentModifyingAssociationEndSignatureImplementationImpl.java
index 5588db2..b9ec9cf 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ExtentModifyingAssociationEndSignatureImplementationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ExtentModifyingAssociationEndSignatureImplementationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureImpl.java
index c763766..e80ced5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureImplementationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureImplementationImpl.java
index e925c0a..efa4bfc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureImplementationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureImplementationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureTypeDefinitionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureTypeDefinitionImpl.java
index 7292fed..576b0f4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureTypeDefinitionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/FunctionSignatureTypeDefinitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/InScopeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/InScopeImpl.java
index 8868cc7..ed36493 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/InScopeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/InScopeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkAdditionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkAdditionImpl.java
index 5770599..395c8ce 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkAdditionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkAdditionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkManipulationAtPositionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkManipulationAtPositionImpl.java
index 96df5e1..4623e0c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkManipulationAtPositionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkManipulationAtPositionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkRemovalImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkRemovalImpl.java
index c0017a7..c2a98e2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkRemovalImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkRemovalImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkSettingImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkSettingImpl.java
index e237a42..5429936 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkSettingImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkSettingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkTraversalImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkTraversalImpl.java
index 78a54ad..9ed76db 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkTraversalImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/LinkTraversalImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/MethodSignatureImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/MethodSignatureImpl.java
index 504a32d..5b4d8ea 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/MethodSignatureImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/MethodSignatureImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/MultiplicityImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/MultiplicityImpl.java
index 6c4c21f..736b6cb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/MultiplicityImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/MultiplicityImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NamedValueImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NamedValueImpl.java
index b8fd9b1..59629ac 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NamedValueImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NamedValueImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NativeImplImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NativeImplImpl.java
index f4286b3..82f8e3f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NativeImplImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NativeImplImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NestedTypeDefinitionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NestedTypeDefinitionImpl.java
index 0a44114..98828e1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NestedTypeDefinitionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/NestedTypeDefinitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ParameterImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ParameterImpl.java
index c227e0b..3bf4e3f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ParameterImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/ParameterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/PlatformSpecificImplementationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/PlatformSpecificImplementationImpl.java
index e4461d4..af0b5d2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/PlatformSpecificImplementationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/PlatformSpecificImplementationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SapClassImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SapClassImpl.java
index d698237..488fa3c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SapClassImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SapClassImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureImpl.java
index 64d621e..798dbcc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureImplementationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureImplementationImpl.java
index 8e2d246..43def16 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureImplementationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureImplementationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureOwnerImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureOwnerImpl.java
index 81e4010..b60a675 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureOwnerImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/SignatureOwnerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypeAdapterImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypeAdapterImpl.java
index 4dea3b8..f3c666d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypeAdapterImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypeAdapterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypeDefinitionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypeDefinitionImpl.java
index f064890..4a7623a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypeDefinitionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypeDefinitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypedElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypedElementImpl.java
index 23fddca..8f08d68 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypedElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/impl/TypedElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesAdapterFactory.java
index b26a1a4..9f15df6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesSwitch.java
index b79dade..899c61d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesValidator.java
index 0cd032b..fea69ac 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/classes/util/ClassesValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/Constraint.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/Constraint.java
index a291098..705646b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/Constraint.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/Constraint.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ConstraintsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ConstraintsFactory.java
index 99e9f71..249ad9b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ConstraintsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ConstraintsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ConstraintsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ConstraintsPackage.java
index 0c8f2a2..8e225a8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ConstraintsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ConstraintsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ObjectState.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ObjectState.java
index 8cb8e34..c12047a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ObjectState.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/ObjectState.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/Severity.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/Severity.java
index c934ff6..77f3a2f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/Severity.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/Severity.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/SeverityInState.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/SeverityInState.java
index d1b0ac7..bf23448 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/SeverityInState.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/SeverityInState.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintImpl.java
index 0460a3e..943f74b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintsFactoryImpl.java
index e222222..63ade55 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintsPackageImpl.java
index 276e865..7957090 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/ConstraintsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/SeverityInStateImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/SeverityInStateImpl.java
index 6468d07..23fc3de 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/SeverityInStateImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/impl/SeverityInStateImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsAdapterFactory.java
index 7588353..5eb605e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsSwitch.java
index 9beb298..9516bd9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsValidator.java
index 9a99dd7..84e0d96 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/constraints/util/ConstraintsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/DocumentsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/DocumentsFactory.java
index 4891506..7e8a61d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/DocumentsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/DocumentsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/DocumentsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/DocumentsPackage.java
index c8b4364..e83892a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/DocumentsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/DocumentsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/Dummy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/Dummy.java
index 85a1765..416e5f8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/Dummy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/Dummy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DocumentsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DocumentsFactoryImpl.java
index 4bc15c5..c8825c8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DocumentsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DocumentsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DocumentsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DocumentsPackageImpl.java
index 1af47c1..18c4419 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DocumentsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DocumentsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DummyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DummyImpl.java
index 31b9151..62cb249 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DummyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/impl/DummyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/util/DocumentsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/util/DocumentsAdapterFactory.java
index ff823ff..31f3e45 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/util/DocumentsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/util/DocumentsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/util/DocumentsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/util/DocumentsSwitch.java
index 270b211..4330a1e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/util/DocumentsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/documents/util/DocumentsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ActualTypeParameter.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ActualTypeParameter.java
index 84de2ef..22fcb59 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ActualTypeParameter.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ActualTypeParameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ClassParameterization.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ClassParameterization.java
index 793337e..8540ba1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ClassParameterization.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ClassParameterization.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/FormalTypeParameter.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/FormalTypeParameter.java
index 7b0cbd4..9655498 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/FormalTypeParameter.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/FormalTypeParameter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/GenericsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/GenericsFactory.java
index 530229c..ceb9f23 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/GenericsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/GenericsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/GenericsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/GenericsPackage.java
index 57cd383..6fd5c0b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/GenericsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/GenericsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ParameterizedClassInstantiation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ParameterizedClassInstantiation.java
index 3a61f59..b090b41 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ParameterizedClassInstantiation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/ParameterizedClassInstantiation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ActualTypeParameterImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ActualTypeParameterImpl.java
index e295aa2..8c1cc1f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ActualTypeParameterImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ActualTypeParameterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ClassParameterizationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ClassParameterizationImpl.java
index c436d93..4682832 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ClassParameterizationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ClassParameterizationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/FormalTypeParameterImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/FormalTypeParameterImpl.java
index 1a46689..551e109 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/FormalTypeParameterImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/FormalTypeParameterImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/GenericsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/GenericsFactoryImpl.java
index a73b095..22338bf 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/GenericsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/GenericsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/GenericsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/GenericsPackageImpl.java
index 45bc28a..0619efa 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/GenericsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/GenericsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ParameterizedClassInstantiationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ParameterizedClassInstantiationImpl.java
index f839aec..451ff37 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ParameterizedClassInstantiationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/impl/ParameterizedClassInstantiationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsAdapterFactory.java
index 8224359..78d1101 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsSwitch.java
index b30e10c..478085f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsValidator.java
index 1995ed5..d5a129d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/generics/util/GenericsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/Dummy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/Dummy.java
index 8e5b632..189f77c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/Dummy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/Dummy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/QuantitystructureFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/QuantitystructureFactory.java
index 3e4dc28..b0af49c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/QuantitystructureFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/QuantitystructureFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/QuantitystructurePackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/QuantitystructurePackage.java
index 4e35987..5a9cf57 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/QuantitystructurePackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/QuantitystructurePackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/DummyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/DummyImpl.java
index 06e6dcf..99cefda 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/DummyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/DummyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/QuantitystructureFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/QuantitystructureFactoryImpl.java
index 512e1ca..5f567e4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/QuantitystructureFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/QuantitystructureFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/QuantitystructurePackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/QuantitystructurePackageImpl.java
index 5424d0b..54541a3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/QuantitystructurePackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/impl/QuantitystructurePackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/util/QuantitystructureAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/util/QuantitystructureAdapterFactory.java
index 5df6a91..8f0e3ce 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/util/QuantitystructureAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/util/QuantitystructureAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/util/QuantitystructureSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/util/QuantitystructureSwitch.java
index 25d26a9..89cb446 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/util/QuantitystructureSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/quantitystructure/util/QuantitystructureSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimeDependency.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimeDependency.java
index 5d44fd1..ac94c65 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimeDependency.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimeDependency.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimedependencyFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimedependencyFactory.java
index eda103d..c74ac06 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimedependencyFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimedependencyFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimedependencyPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimedependencyPackage.java
index e9c3d61..19f178b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimedependencyPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/TimedependencyPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimeDependencyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimeDependencyImpl.java
index c8d7b0f..834dd31 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimeDependencyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimeDependencyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimedependencyFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimedependencyFactoryImpl.java
index 2d93876..8cfabf6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimedependencyFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimedependencyFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimedependencyPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimedependencyPackageImpl.java
index a4a1657..daecb99 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimedependencyPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/impl/TimedependencyPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencyAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencyAdapterFactory.java
index 5545077..87ae12f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencyAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencyAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencySwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencySwitch.java
index a93a591..f0fbb19 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencySwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencySwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencyValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencyValidator.java
index 1e09652..8667c26 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencyValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/timedependency/util/TimedependencyValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TupleElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TupleElement.java
index 9269f17..c8cdb6d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TupleElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TupleElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TupleTypeDefinition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TupleTypeDefinition.java
index 6733bbf..38899b2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TupleTypeDefinition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TupleTypeDefinition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TuplesFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TuplesFactory.java
index d7fb9fb..8c3533c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TuplesFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TuplesFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TuplesPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TuplesPackage.java
index 664e42d..c9d496f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TuplesPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/TuplesPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TupleElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TupleElementImpl.java
index d8c0a66..bdd20c1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TupleElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TupleElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TupleTypeDefinitionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TupleTypeDefinitionImpl.java
index 6df0a74..03f5df58 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TupleTypeDefinitionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TupleTypeDefinitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TuplesFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TuplesFactoryImpl.java
index 2b253c8..7a6336c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TuplesFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TuplesFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TuplesPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TuplesPackageImpl.java
index 0e78e96..0fee08c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TuplesPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/impl/TuplesPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/util/TuplesAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/util/TuplesAdapterFactory.java
index 448ac76..d0648e3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/util/TuplesAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/util/TuplesAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/util/TuplesSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/util/TuplesSwitch.java
index 3b0a9da..146a9e9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/util/TuplesSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/data/tuples/util/TuplesSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/AnalyticsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/AnalyticsFactory.java
index 769ccc0..97529ba 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/AnalyticsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/AnalyticsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/AnalyticsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/AnalyticsPackage.java
index af45923..647b54b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/AnalyticsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/AnalyticsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/CellSet.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/CellSet.java
index 3b43d98..f61a6a9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/CellSet.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/CellSet.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/Dimension.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/Dimension.java
index 30a323e..e7747d4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/Dimension.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/Dimension.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/DimensionDefinition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/DimensionDefinition.java
index 8a75fd5..fc9101c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/DimensionDefinition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/DimensionDefinition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/DimensionExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/DimensionExpression.java
index 9249034..6401df8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/DimensionExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/DimensionExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/GroupBy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/GroupBy.java
index ede2864..9e1f353 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/GroupBy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/GroupBy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/AnalyticsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/AnalyticsFactoryImpl.java
index ac39d0a..c9052e0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/AnalyticsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/AnalyticsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/AnalyticsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/AnalyticsPackageImpl.java
index 7c9a66d..aed8d01 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/AnalyticsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/AnalyticsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/CellSetImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/CellSetImpl.java
index 524518a..4d02771 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/CellSetImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/CellSetImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionDefinitionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionDefinitionImpl.java
index 31e71aa..f144aea 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionDefinitionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionDefinitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionExpressionImpl.java
index ffc0729..1410932 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionImpl.java
index 827bf5b..ffe087c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/DimensionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/GroupByImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/GroupByImpl.java
index 13df7f0..b66c385 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/GroupByImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/impl/GroupByImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsAdapterFactory.java
index 4209246..de9cdfe 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsSwitch.java
index 648c595..200ad19 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsValidator.java
index 64bbed7..4c38fc8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/analytics/util/AnalyticsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/AsList.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/AsList.java
index e87b6a5..ff616f6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/AsList.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/AsList.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/AssociationEndNavigationExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/AssociationEndNavigationExpression.java
index 8f39dcd..7d71a70 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/AssociationEndNavigationExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/AssociationEndNavigationExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Conditional.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Conditional.java
index 17b7cd1..6cff57a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Conditional.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Conditional.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ConditionalExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ConditionalExpression.java
index 9c36b8e..937c7e5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ConditionalExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ConditionalExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ContentEquals.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ContentEquals.java
index f23c73f..fb6d6d3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ContentEquals.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ContentEquals.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Equals.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Equals.java
index 0b1788a..6d30b19 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Equals.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Equals.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Expression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Expression.java
index 7e326de..f852278 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Expression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Expression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionWithArgument.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionWithArgument.java
index aebf9a4..e9ba4d1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionWithArgument.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionWithArgument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionsFactory.java
index ccf7c07..e99f657 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionsPackage.java
index 51ba771..a561ca3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ExpressionsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/FunctionCallExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/FunctionCallExpression.java
index 5c128af..e6c7a40 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/FunctionCallExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/FunctionCallExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Head.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Head.java
index 57f0fec..5cd63a4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Head.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Head.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Map.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Map.java
index e30744c..ce43cbe 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Map.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Map.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/MethodCallExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/MethodCallExpression.java
index 48300f4..cced1e8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/MethodCallExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/MethodCallExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/NavigationStep.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/NavigationStep.java
index fb859e4..d933972 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/NavigationStep.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/NavigationStep.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectBasedExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectBasedExpression.java
index 25bedb5..5d403c9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectBasedExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectBasedExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectCount.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectCount.java
index c1c3de0..dd311da 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectCount.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectCount.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectCreationExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectCreationExpression.java
index 772eb5f..a6d48f8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectCreationExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/ObjectCreationExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Replace.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Replace.java
index ff2a885..1a6cd22 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Replace.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Replace.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/SignatureCallExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/SignatureCallExpression.java
index e76d058..e6a6b01 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/SignatureCallExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/SignatureCallExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Tail.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Tail.java
index 0e23123..81ce7db 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Tail.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Tail.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Ternary.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Ternary.java
index 00985dd..5436257 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Ternary.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/Ternary.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/This.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/This.java
index 17a8225..ea0fb79 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/This.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/This.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/VariableExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/VariableExpression.java
index 53da9ab..380e2d4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/VariableExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/VariableExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/WithArgument.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/WithArgument.java
index 32ca753..8b83c7d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/WithArgument.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/WithArgument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionExpression.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionExpression.java
index 80137fe..5f5c0f9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionExpression.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionExpression.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionExpressionWithArgument.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionExpressionWithArgument.java
index b8c86a0..e303ff3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionExpressionWithArgument.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionExpressionWithArgument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionexpressionsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionexpressionsFactory.java
index e7d902b..5b8795c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionexpressionsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionexpressionsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionexpressionsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionexpressionsPackage.java
index 0e708a2..d7dadf3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionexpressionsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/CollectionexpressionsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Excluding.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Excluding.java
index f942f0d..e7eb6cb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Excluding.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Excluding.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/ExcludingAt.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/ExcludingAt.java
index 2baf70a..52140dc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/ExcludingAt.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/ExcludingAt.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Including.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Including.java
index a365774..a0dff2e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Including.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Including.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/IncludingAt.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/IncludingAt.java
index 07b16bd..da8fb24 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/IncludingAt.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/IncludingAt.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Iterate.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Iterate.java
index ef708b9..265c547 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Iterate.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/Iterate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/WithPosition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/WithPosition.java
index e2092ab..3691077 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/WithPosition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/WithPosition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionExpressionImpl.java
index d48a072..001ea91 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionExpressionWithArgumentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionExpressionWithArgumentImpl.java
index 6190e2f..09f779a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionExpressionWithArgumentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionExpressionWithArgumentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionexpressionsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionexpressionsFactoryImpl.java
index 8501b22..5f55551 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionexpressionsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionexpressionsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionexpressionsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionexpressionsPackageImpl.java
index 8fba06d..c08b2b9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionexpressionsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/CollectionexpressionsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/ExcludingAtImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/ExcludingAtImpl.java
index 105981c..20d7d1c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/ExcludingAtImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/ExcludingAtImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/ExcludingImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/ExcludingImpl.java
index fdb57d4..67d57e3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/ExcludingImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/ExcludingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IncludingAtImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IncludingAtImpl.java
index fcd01ee..3b3cfc8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IncludingAtImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IncludingAtImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IncludingImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IncludingImpl.java
index 3a2b6b7..2b74710 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IncludingImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IncludingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IterateImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IterateImpl.java
index 6794b43..982b34f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IterateImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/IterateImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/WithPositionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/WithPositionImpl.java
index 32a613b..a8b5270 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/WithPositionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/impl/WithPositionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsAdapterFactory.java
index cafb106..fa29f7a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsSwitch.java
index 462c22d..2eafde4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsValidator.java
index f580fa6..d9295ef 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/collectionexpressions/util/CollectionexpressionsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/AnonymousFunctionExpr.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/AnonymousFunctionExpr.java
index ae87508..5ee89c5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/AnonymousFunctionExpr.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/AnonymousFunctionExpr.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FpFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FpFactory.java
index dc29ac7..e39099a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FpFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FpFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FpPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FpPackage.java
index ec4ea11..a53ca29 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FpPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FpPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FunctionFromMethodExpr.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FunctionFromMethodExpr.java
index 8831d5b..1d86cc6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FunctionFromMethodExpr.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/FunctionFromMethodExpr.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/AnonymousFunctionExprImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/AnonymousFunctionExprImpl.java
index d35de3b..973acf3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/AnonymousFunctionExprImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/AnonymousFunctionExprImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FpFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FpFactoryImpl.java
index 4d60b70..8fcce86 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FpFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FpFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FpPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FpPackageImpl.java
index 9288492..0f8305c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FpPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FpPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FunctionFromMethodExprImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FunctionFromMethodExprImpl.java
index 29847a9..a1f459d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FunctionFromMethodExprImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/impl/FunctionFromMethodExprImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpAdapterFactory.java
index 914e205..0777280 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpSwitch.java
index 872a5d8..c1c51e9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpValidator.java
index d9dde43..bfc091d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/fp/util/FpValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/AsListImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/AsListImpl.java
index d1c4245..784ad52 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/AsListImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/AsListImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/AssociationEndNavigationExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/AssociationEndNavigationExpressionImpl.java
index 9e6af7f..f11dcd2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/AssociationEndNavigationExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/AssociationEndNavigationExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ConditionalExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ConditionalExpressionImpl.java
index ae55170..f57bc80 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ConditionalExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ConditionalExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ConditionalImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ConditionalImpl.java
index e11f650..0f2ee04 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ConditionalImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ConditionalImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ContentEqualsImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ContentEqualsImpl.java
index 378e3ab..60b630a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ContentEqualsImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ContentEqualsImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/EqualsImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/EqualsImpl.java
index f5eafe0..eac8c9e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/EqualsImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/EqualsImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionImpl.java
index dd48b83..eee5cd9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionWithArgumentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionWithArgumentImpl.java
index 90236c0..a7d95f1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionWithArgumentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionWithArgumentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionsFactoryImpl.java
index 37c8f0f..cbc15c5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionsPackageImpl.java
index 966e312..19a8236 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ExpressionsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/FunctionCallExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/FunctionCallExpressionImpl.java
index ef554e9..4d54033 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/FunctionCallExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/FunctionCallExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/HeadImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/HeadImpl.java
index 89c72f4..d70adc7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/HeadImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/HeadImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/MapImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/MapImpl.java
index 4482614..218bac1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/MapImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/MapImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/MethodCallExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/MethodCallExpressionImpl.java
index ec4c5a9..c9685e3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/MethodCallExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/MethodCallExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/NavigationStepImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/NavigationStepImpl.java
index fa2eb27..ba0d94a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/NavigationStepImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/NavigationStepImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectBasedExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectBasedExpressionImpl.java
index 74dac4a..52884e2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectBasedExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectBasedExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectCountImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectCountImpl.java
index b8ec45a..17330b1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectCountImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectCountImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectCreationExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectCreationExpressionImpl.java
index 8ead5d9..095e8bb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectCreationExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ObjectCreationExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ReplaceImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ReplaceImpl.java
index 1eb878a..d93e4c9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ReplaceImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ReplaceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/SignatureCallExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/SignatureCallExpressionImpl.java
index 59f57ce..0317958 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/SignatureCallExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/SignatureCallExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/TailImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/TailImpl.java
index a748734..1bf2b14 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/TailImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/TailImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/TernaryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/TernaryImpl.java
index c3ab464..0971b98 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/TernaryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/TernaryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ThisImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ThisImpl.java
index c152a8b..dea5cd7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ThisImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/ThisImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/VariableExpressionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/VariableExpressionImpl.java
index 7e2a179..1b18d6e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/VariableExpressionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/VariableExpressionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/WithArgumentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/WithArgumentImpl.java
index 322630c..092f1ad 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/WithArgumentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/impl/WithArgumentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/BinaryLiteral.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/BinaryLiteral.java
index a418b3f..df585e4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/BinaryLiteral.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/BinaryLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/BooleanLiteral.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/BooleanLiteral.java
index a8161c8..ef5b256 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/BooleanLiteral.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/BooleanLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/Literal.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/Literal.java
index 042b7a8..70533af 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/Literal.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/Literal.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/LiteralsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/LiteralsFactory.java
index dc8de3c..a5fb8db 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/LiteralsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/LiteralsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/LiteralsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/LiteralsPackage.java
index b332ebd..db5e6ee 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/LiteralsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/LiteralsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/NumberLiteral.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/NumberLiteral.java
index 3c59870..b8ec65b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/NumberLiteral.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/NumberLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/ObjectLiteral.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/ObjectLiteral.java
index 40f0202..1c09672 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/ObjectLiteral.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/ObjectLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/StringLiteral.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/StringLiteral.java
index 72c2fe1..fcfb944 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/StringLiteral.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/StringLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/TimePointLiteral.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/TimePointLiteral.java
index fcde70f..c0bd03c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/TimePointLiteral.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/TimePointLiteral.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/ValueInit.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/ValueInit.java
index b88975d..6b309f9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/ValueInit.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/ValueInit.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/BinaryLiteralImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/BinaryLiteralImpl.java
index 081f8dd..58aab4a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/BinaryLiteralImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/BinaryLiteralImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/BooleanLiteralImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/BooleanLiteralImpl.java
index daffa02..b7e1ba9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/BooleanLiteralImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/BooleanLiteralImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralImpl.java
index 170c928..4f73408 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralsFactoryImpl.java
index 2a1d2a9..f5e0848 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralsPackageImpl.java
index cfad9b7..dedca9f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/LiteralsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/NumberLiteralImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/NumberLiteralImpl.java
index 984de57..8f5e36a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/NumberLiteralImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/NumberLiteralImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/ObjectLiteralImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/ObjectLiteralImpl.java
index f1eb57a..7bbcbd7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/ObjectLiteralImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/ObjectLiteralImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/StringLiteralImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/StringLiteralImpl.java
index 0203273..9da57f6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/StringLiteralImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/StringLiteralImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/TimePointLiteralImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/TimePointLiteralImpl.java
index b35757f..65a2839 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/TimePointLiteralImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/TimePointLiteralImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/ValueInitImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/ValueInitImpl.java
index f1ef62b..6dfa663 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/ValueInitImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/impl/ValueInitImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsAdapterFactory.java
index c57194e..45341e8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsSwitch.java
index 1e308c0..1a2b576 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsValidator.java
index b663676..39c9d97 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/literals/util/LiteralsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsAdapterFactory.java
index 0d2d1df..a489c9a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsSwitch.java
index d5bf225..5186e97 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsValidator.java
index 24cb9c4..2a71df8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/expressions/util/ExpressionsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/FromClause.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/FromClause.java
index 01fdaab..4ad732f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/FromClause.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/FromClause.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/OqlQuery.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/OqlQuery.java
index 1477042..57e9e83 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/OqlQuery.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/OqlQuery.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/QueryFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/QueryFactory.java
index a4b2bad..5555b95 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/QueryFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/QueryFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/QueryPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/QueryPackage.java
index 0af0886..9fa43c3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/QueryPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/QueryPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/Selection.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/Selection.java
index fcdf5bd..aebf80c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/Selection.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/Selection.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/FromClauseImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/FromClauseImpl.java
index a8fee2c..22be19e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/FromClauseImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/FromClauseImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/OqlQueryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/OqlQueryImpl.java
index db092bb..952a98d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/OqlQueryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/OqlQueryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/QueryFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/QueryFactoryImpl.java
index d1eb537..ebb3005 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/QueryFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/QueryFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/QueryPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/QueryPackageImpl.java
index 33cc251..d98d608 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/QueryPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/QueryPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/SelectionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/SelectionImpl.java
index a0880bd..d67a298 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/SelectionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/impl/SelectionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QueryAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QueryAdapterFactory.java
index c34e2ad..c221ce5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QueryAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QueryAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QuerySwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QuerySwitch.java
index b5b4fe8..e1948e3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QuerySwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QuerySwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QueryValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QueryValidator.java
index ffc51d2..f1980b4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QueryValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/dataaccess/query/util/QueryValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/Binding.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/Binding.java
index a1c8997..898e12e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/Binding.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/Binding.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/BindingFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/BindingFactory.java
index 2c72f33..dcdf07d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/BindingFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/BindingFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/BindingPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/BindingPackage.java
index 8c0f1ba..1f31c8b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/BindingPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/BindingPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpBinding.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpBinding.java
index fbbdfaa..9fe4bcd 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpBinding.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpBinding.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpGetBinding.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpGetBinding.java
index bc34857..4fe5298 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpGetBinding.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpGetBinding.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpPutBinding.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpPutBinding.java
index 645fa75..5ef18de 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpPutBinding.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/HttpPutBinding.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/RestUrlPattern.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/RestUrlPattern.java
index 5103a4b..cdd4d9a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/RestUrlPattern.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/RestUrlPattern.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/SimpleUrlPattern.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/SimpleUrlPattern.java
index 839d734..dd282c1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/SimpleUrlPattern.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/SimpleUrlPattern.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/UrlPattern.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/UrlPattern.java
index f4c7581..d788fd8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/UrlPattern.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/UrlPattern.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingFactoryImpl.java
index 440441c..9c4b41a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingImpl.java
index dfafa5c..2a1b7a1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingPackageImpl.java
index 4720d06..076ac39 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/BindingPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpBindingImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpBindingImpl.java
index 598b7dd..e26ed5f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpBindingImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpBindingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpGetBindingImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpGetBindingImpl.java
index 3d4116c..2ab9c11 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpGetBindingImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpGetBindingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpPutBindingImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpPutBindingImpl.java
index 531fb94..a953ea6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpPutBindingImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/HttpPutBindingImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/RestUrlPatternImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/RestUrlPatternImpl.java
index eefb551..3df60b9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/RestUrlPatternImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/RestUrlPatternImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/SimpleUrlPatternImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/SimpleUrlPatternImpl.java
index 6ac7f83..2d956e8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/SimpleUrlPatternImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/SimpleUrlPatternImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/UrlPatternImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/UrlPatternImpl.java
index 5cdca78..611c48d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/UrlPatternImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/impl/UrlPatternImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingAdapterFactory.java
index 2846ff2..606721c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingSwitch.java
index a047666..86f5c2a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingValidator.java
index 3788d5b..b38abe7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/binding/util/BindingValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/IntegrationScenario.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/IntegrationScenario.java
index ceb185e..0f3029d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/IntegrationScenario.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/IntegrationScenario.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessComponentInteraction.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessComponentInteraction.java
index 42e5027..02b3cc3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessComponentInteraction.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessComponentInteraction.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessintegrationFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessintegrationFactory.java
index ac669e9..23406bf 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessintegrationFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessintegrationFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessintegrationPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessintegrationPackage.java
index d871274..dbb478d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessintegrationPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/ProcessintegrationPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/IntegrationScenarioImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/IntegrationScenarioImpl.java
index ed69a91..a4a7f66 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/IntegrationScenarioImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/IntegrationScenarioImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessComponentInteractionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessComponentInteractionImpl.java
index ab69362..f7f0b1b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessComponentInteractionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessComponentInteractionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessintegrationFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessintegrationFactoryImpl.java
index 2609887..e06a0b4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessintegrationFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessintegrationFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessintegrationPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessintegrationPackageImpl.java
index 6fe1087..b00e19c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessintegrationPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/impl/ProcessintegrationPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/util/ProcessintegrationAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/util/ProcessintegrationAdapterFactory.java
index aea2ff8..b175502 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/util/ProcessintegrationAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/util/ProcessintegrationAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/util/ProcessintegrationSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/util/ProcessintegrationSwitch.java
index 90b3a3c..46ae07a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/util/ProcessintegrationSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/processintegration/util/ProcessintegrationSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AbstractContent.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AbstractContent.java
index bebbecc..8b39411 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AbstractContent.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AbstractContent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AbstractType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AbstractType.java
index ed28388..5a1bdf9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AbstractType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AbstractType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Annotation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Annotation.java
index 759245f..15de798 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Annotation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Annotation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Any.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Any.java
index 8b67488..78125cd 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Any.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Any.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AttUseType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AttUseType.java
index 5931122..8516814 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AttUseType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/AttUseType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Attribute.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Attribute.java
index 50f4aec..4f03694 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Attribute.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Attribute.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Choice.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Choice.java
index c23810e..606b178 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Choice.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Choice.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ComplexContent.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ComplexContent.java
index 95870a7..524ae59 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ComplexContent.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ComplexContent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ComplexType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ComplexType.java
index c022345..f23ca98 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ComplexType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ComplexType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Containable.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Containable.java
index 4b096ca..41252da 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Containable.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Containable.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ElementDefinition.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ElementDefinition.java
index e728698..4e83bea 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ElementDefinition.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ElementDefinition.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ElementReference.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ElementReference.java
index 485a3a9..21be4d4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ElementReference.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/ElementReference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Group.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Group.java
index fe716e0..7dd5756 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Group.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Group.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/NamedElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/NamedElement.java
index f242c17..9a4cb0a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/NamedElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/NamedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Notation.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Notation.java
index 799fa68..a1f83eb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Notation.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Notation.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Root.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Root.java
index 5a1cc35..b4586dc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Root.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Root.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Sequence.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Sequence.java
index 3723d93..7c00dfa 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Sequence.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/Sequence.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/SimpleContent.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/SimpleContent.java
index 774890c..cbc17a3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/SimpleContent.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/SimpleContent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/SimpleType.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/SimpleType.java
index 1668226..55fccc1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/SimpleType.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/SimpleType.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/XsdFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/XsdFactory.java
index 8dfc1e9..58a8d95 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/XsdFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/XsdFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/XsdPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/XsdPackage.java
index b9b56d5..2286cab 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/XsdPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/XsdPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AbstractContentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AbstractContentImpl.java
index d512107..9a3f4cb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AbstractContentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AbstractContentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AbstractTypeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AbstractTypeImpl.java
index 9e7f03c..457a073 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AbstractTypeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AbstractTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AnnotationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AnnotationImpl.java
index 6801625..80839cb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AnnotationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AnnotationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AnyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AnyImpl.java
index e7ec95d..84747b9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AnyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AnyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AttributeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AttributeImpl.java
index 9db6473..817cdf9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AttributeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/AttributeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ChoiceImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ChoiceImpl.java
index 2573c72..65c38ff 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ChoiceImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ChoiceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ComplexContentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ComplexContentImpl.java
index 6648cbd..fc547a8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ComplexContentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ComplexContentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ComplexTypeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ComplexTypeImpl.java
index 202b677..6700e7d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ComplexTypeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ComplexTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ContainableImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ContainableImpl.java
index 69e42cd..b471f4d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ContainableImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ContainableImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ElementDefinitionImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ElementDefinitionImpl.java
index f77f939..e85e6b6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ElementDefinitionImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ElementDefinitionImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ElementReferenceImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ElementReferenceImpl.java
index 6821f3d..b73006d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ElementReferenceImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/ElementReferenceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/GroupImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/GroupImpl.java
index 15a0569..7227f4c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/GroupImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/GroupImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/NamedElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/NamedElementImpl.java
index 29b45df..76ef94b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/NamedElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/NamedElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/NotationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/NotationImpl.java
index cfc30d0..21f551c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/NotationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/NotationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/RootImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/RootImpl.java
index 46258fb..b305e7c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/RootImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/RootImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SequenceImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SequenceImpl.java
index 9200d87..cce84cc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SequenceImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SequenceImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SimpleContentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SimpleContentImpl.java
index cc9e688..75af2e0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SimpleContentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SimpleContentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SimpleTypeImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SimpleTypeImpl.java
index 1df82e8..49ac258 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SimpleTypeImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/SimpleTypeImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/XsdFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/XsdFactoryImpl.java
index 1fabd93..b1cb250 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/XsdFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/XsdFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/XsdPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/XsdPackageImpl.java
index 9412ae1..2561690 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/XsdPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/impl/XsdPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/util/XsdAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/util/XsdAdapterFactory.java
index c6a9414..ed8dc7b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/util/XsdAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/util/XsdAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/util/XsdSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/util/XsdSwitch.java
index edefc19..1445dac 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/util/XsdSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/integration/xsd/util/XsdSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/LocalizationFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/LocalizationFactory.java
index aa05c72..02bb05f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/LocalizationFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/LocalizationFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/LocalizationPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/LocalizationPackage.java
index 4a93bab..1707fc6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/LocalizationPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/LocalizationPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/TranslatableText.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/TranslatableText.java
index d5652f0..020ee45 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/TranslatableText.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/TranslatableText.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/LocalizationFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/LocalizationFactoryImpl.java
index f79976a..5175e18 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/LocalizationFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/LocalizationFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/LocalizationPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/LocalizationPackageImpl.java
index a5eecee..5cc6823 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/LocalizationPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/LocalizationPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/TranslatableTextImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/TranslatableTextImpl.java
index 9dcbbf5..90d52b6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/TranslatableTextImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/impl/TranslatableTextImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/util/LocalizationAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/util/LocalizationAdapterFactory.java
index 2ef3116..19e2202 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/util/LocalizationAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/util/LocalizationAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/util/LocalizationSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/util/LocalizationSwitch.java
index 2925b0d..8c141ad 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/util/LocalizationSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/localization/util/LocalizationSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Application.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Application.java
index c2ca3cb..9e11442 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Application.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Application.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/ModelmanagementFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/ModelmanagementFactory.java
index c1432d8..7b3c4a9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/ModelmanagementFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/ModelmanagementFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/ModelmanagementPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/ModelmanagementPackage.java
index 0e83769..96b3fda 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/ModelmanagementPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/ModelmanagementPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Module.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Module.java
index 2224ff5..cbe61ab 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Module.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Module.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/NamedElement.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/NamedElement.java
index 4840cb3..6437497 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/NamedElement.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/NamedElement.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Package.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Package.java
index f698693..d1be35e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Package.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/Package.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/PackageOwner.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/PackageOwner.java
index 08ea077..f8600d0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/PackageOwner.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/PackageOwner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentUnit.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentUnit.java
index 015acea..ee9f269 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentUnit.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentUnit.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentunitsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentunitsFactory.java
index 0dab387..d739472 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentunitsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentunitsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentunitsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentunitsPackage.java
index c768850..61e0756 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentunitsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/DeploymentunitsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentUnitImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentUnitImpl.java
index d92cc9a..36337b8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentUnitImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentUnitImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentunitsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentunitsFactoryImpl.java
index f36c8f8..c53c7ca 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentunitsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentunitsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentunitsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentunitsPackageImpl.java
index 4e4dcbf..5321e9e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentunitsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/impl/DeploymentunitsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/util/DeploymentunitsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/util/DeploymentunitsAdapterFactory.java
index 342c216..23c6ef4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/util/DeploymentunitsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/util/DeploymentunitsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/util/DeploymentunitsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/util/DeploymentunitsSwitch.java
index 602c73d..0121d48 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/util/DeploymentunitsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/deploymentunits/util/DeploymentunitsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ApplicationImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ApplicationImpl.java
index 91acb98..423090b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ApplicationImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ApplicationImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModelmanagementFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModelmanagementFactoryImpl.java
index 657e0f6..58dd126 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModelmanagementFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModelmanagementFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModelmanagementPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModelmanagementPackageImpl.java
index 38ca140..9334b59 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModelmanagementPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModelmanagementPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModuleImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModuleImpl.java
index eb6c419..f9f3381 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModuleImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/ModuleImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/NamedElementImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/NamedElementImpl.java
index 7c84bb0..ad9eda8 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/NamedElementImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/NamedElementImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/PackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/PackageImpl.java
index 5eeba59..afb9c36 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/PackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/PackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/PackageOwnerImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/PackageOwnerImpl.java
index 3ce229e..00fd584 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/PackageOwnerImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/impl/PackageOwnerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponent.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponent.java
index 54664a6..40fc31a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponent.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponent.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponentInsideCompany.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponentInsideCompany.java
index 4dcee45..e920a8d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponentInsideCompany.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponentInsideCompany.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponentOutsideCompany.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponentOutsideCompany.java
index 44b1e45..14f5d3e7 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponentOutsideCompany.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcessComponentOutsideCompany.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcesscomponentsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcesscomponentsFactory.java
index 3769263..550f622 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcesscomponentsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcesscomponentsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcesscomponentsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcesscomponentsPackage.java
index 72f4ace..af58a38 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcesscomponentsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/ProcesscomponentsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentImpl.java
index 3212385..8baee9b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentInsideCompanyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentInsideCompanyImpl.java
index 48ebb4d..6c16319 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentInsideCompanyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentInsideCompanyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentOutsideCompanyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentOutsideCompanyImpl.java
index 84d9701..a3664e4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentOutsideCompanyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcessComponentOutsideCompanyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcesscomponentsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcesscomponentsFactoryImpl.java
index 74c3b19..6fafebc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcesscomponentsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcesscomponentsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcesscomponentsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcesscomponentsPackageImpl.java
index 285781f..8933229 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcesscomponentsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/impl/ProcesscomponentsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/util/ProcesscomponentsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/util/ProcesscomponentsAdapterFactory.java
index aaf902e..837849a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/util/ProcesscomponentsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/util/ProcesscomponentsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/util/ProcesscomponentsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/util/ProcesscomponentsSwitch.java
index 482c2a9..ab4a712 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/util/ProcesscomponentsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/processcomponents/util/ProcesscomponentsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementAdapterFactory.java
index 25af84a..83eac79 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementSwitch.java
index 44677f4..869de0e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementValidator.java
index ecd117f..aba2e88 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/modelmanagement/util/ModelmanagementValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/ActionsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/ActionsFactory.java
index b0a5ba4..c027cca 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/ActionsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/ActionsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/ActionsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/ActionsPackage.java
index e8a63c1..1ccae24 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/ActionsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/ActionsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Delete.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Delete.java
index c4d90af..107321a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Delete.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Delete.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Rollback.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Rollback.java
index a3199e9..c2873d4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Rollback.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Rollback.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/StatementWithEntityArgument.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/StatementWithEntityArgument.java
index 3a89811..e8de13a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/StatementWithEntityArgument.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/StatementWithEntityArgument.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Store.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Store.java
index dbc0b08..f9def2e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Store.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/Store.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/ActionsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/ActionsFactoryImpl.java
index 567eb21..b4ef172 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/ActionsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/ActionsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/ActionsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/ActionsPackageImpl.java
index fcd70b4..e51ed82 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/ActionsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/ActionsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/DeleteImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/DeleteImpl.java
index 09b1d4a..e8b1d12 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/DeleteImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/DeleteImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/RollbackImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/RollbackImpl.java
index c529984..384b144 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/RollbackImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/RollbackImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/StatementWithEntityArgumentImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/StatementWithEntityArgumentImpl.java
index 9a9dc1a..0dfcfc5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/StatementWithEntityArgumentImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/StatementWithEntityArgumentImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/StoreImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/StoreImpl.java
index cbaa502..6143d76 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/StoreImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/impl/StoreImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsAdapterFactory.java
index a2d53bb..bde1289 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsSwitch.java
index 18ba2ea..1b2dd7b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsValidator.java
index fb0fde0..8aebc06 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/actions/util/ActionsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/All.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/All.java
index aa38a4b..5b2fb17 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/All.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/All.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/Commit.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/Commit.java
index a641919..6012d86 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/Commit.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/Commit.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/ExpressionsFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/ExpressionsFactory.java
index 796e7d1..b2419c0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/ExpressionsFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/ExpressionsFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/ExpressionsPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/ExpressionsPackage.java
index ce92119..02edba6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/ExpressionsPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/ExpressionsPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/Snapshot.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/Snapshot.java
index 86c52a4..af084c4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/Snapshot.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/Snapshot.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/SnapshotSelection.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/SnapshotSelection.java
index f83a99c..0a35911 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/SnapshotSelection.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/SnapshotSelection.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/AllImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/AllImpl.java
index a6bd08f..46b0ff2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/AllImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/AllImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/CommitImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/CommitImpl.java
index e8b19ce..fc00073 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/CommitImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/CommitImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/ExpressionsFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/ExpressionsFactoryImpl.java
index 2b80cde..e6acf2b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/ExpressionsFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/ExpressionsFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/ExpressionsPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/ExpressionsPackageImpl.java
index e88a870..1e23df9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/ExpressionsPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/ExpressionsPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/SnapshotImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/SnapshotImpl.java
index eff01c0..0382cd2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/SnapshotImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/impl/SnapshotImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsAdapterFactory.java
index af0ac45..62be27b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsSwitch.java
index 2a44560..c5ebbdb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsValidator.java
index 2523d7e..a8a7e56 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/persistence/expressions/util/ExpressionsValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Data_bindingFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Data_bindingFactory.java
index 705b624..4e57a46 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Data_bindingFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Data_bindingFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Data_bindingPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Data_bindingPackage.java
index 8490ac2..6cdff9b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Data_bindingPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Data_bindingPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Dummy.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Dummy.java
index 1b06d5d..f37ee7f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Dummy.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/Dummy.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/Data_bindingFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/Data_bindingFactoryImpl.java
index 89b8b23..eea9db2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/Data_bindingFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/Data_bindingFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/Data_bindingPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/Data_bindingPackageImpl.java
index 07f4e24..f1c993c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/Data_bindingPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/Data_bindingPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/DummyImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/DummyImpl.java
index e345dfb..8e8a4fd 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/DummyImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/impl/DummyImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/util/Data_bindingAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/util/Data_bindingAdapterFactory.java
index c58eaae..00afaa3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/util/Data_bindingAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/util/Data_bindingAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/util/Data_bindingSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/util/Data_bindingSwitch.java
index 39d59a6..29422cc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/util/Data_bindingSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/data_binding/util/Data_bindingSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/StringTemplate.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/StringTemplate.java
index 6dd3e1a..eadb992 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/StringTemplate.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/StringTemplate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/TemplatesFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/TemplatesFactory.java
index 8db629f..dbff355 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/TemplatesFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/TemplatesFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/TemplatesPackage.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/TemplatesPackage.java
index fe0a4fc..545a98a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/TemplatesPackage.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/TemplatesPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/StringTemplateImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/StringTemplateImpl.java
index 2cfff2f..00cfafe 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/StringTemplateImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/StringTemplateImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/TemplatesFactoryImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/TemplatesFactoryImpl.java
index 41ff045..34faa80 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/TemplatesFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/TemplatesFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/TemplatesPackageImpl.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/TemplatesPackageImpl.java
index 94f4c0e..3666f3e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/TemplatesPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/impl/TemplatesPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesAdapterFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesAdapterFactory.java
index 85501dc..d3a3c4a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesSwitch.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesSwitch.java
index 38952ce..d363e71 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesSwitch.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesValidator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesValidator.java
index 0279208..65b7798 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesValidator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm/src/ui/templates/util/TemplatesValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2014 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/about.html b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/about.html
index e02cb11..a22e307 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/about.html
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.examples.impactanalyzer.tests/build.properties b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/build.properties
index cef1e9b..3679f19 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/build.properties
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/build.properties
@@ -1,9 +1,9 @@
 ###########################################################################
 # Copyright (c) 2009, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/plugin.properties b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/plugin.properties
index 945bf7c..704f865 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerAllTests.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerAllTests.java
index d9503a7..aa7137f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerAllTests.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerAllTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2013 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerIAAnnotationsSuite.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerIAAnnotationsSuite.java
index 6112ff4..adba204 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerIAAnnotationsSuite.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerIAAnnotationsSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerNavigationStepsAndIAAnnotationsSuite.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerNavigationStepsAndIAAnnotationsSuite.java
index 64aa33d..4cb629e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerNavigationStepsAndIAAnnotationsSuite.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerNavigationStepsAndIAAnnotationsSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerNavigationStepsSuite.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerNavigationStepsSuite.java
index a9381d8..97d971a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerNavigationStepsSuite.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerNavigationStepsSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerUnusedChecksSuite.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerUnusedChecksSuite.java
index 7eaf402..e357367 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerUnusedChecksSuite.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/ImpactAnalyzerUnusedChecksSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/deltaPropagation/PartialEvaluatorTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/deltaPropagation/PartialEvaluatorTest.java
index c3d402a..530390c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/deltaPropagation/PartialEvaluatorTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/deltaPropagation/PartialEvaluatorTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/derivedPropertyHandling/DerivedPropertyAdapterTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/derivedPropertyHandling/DerivedPropertyAdapterTest.java
index 3be220f..a878e8c 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/derivedPropertyHandling/DerivedPropertyAdapterTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/derivedPropertyHandling/DerivedPropertyAdapterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/EventAdapter.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/EventAdapter.java
index 500d925..ffc758a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/EventAdapter.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/EventAdapter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/EventManagerNaive.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/EventManagerNaive.java
index e6ff4f3..447d679 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/EventManagerNaive.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/EventManagerNaive.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/FilterSynthesisEMEnabledTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/FilterSynthesisEMEnabledTest.java
index bfcf753..f87b149 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/FilterSynthesisEMEnabledTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/FilterSynthesisEMEnabledTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/FilterSynthesisTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/FilterSynthesisTest.java
index 3c0b924..81544fc 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/FilterSynthesisTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/FilterSynthesisTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/PerformanceStressForEventManagerTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/PerformanceStressForEventManagerTest.java
index 489f431..78c7ef0 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/PerformanceStressForEventManagerTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/filterSynthesis/PerformanceStressForEventManagerTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/helper/ExampleApp.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/helper/ExampleApp.java
index f994a31..1d05dd9 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/helper/ExampleApp.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/helper/ExampleApp.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/ImpactAnalyzerImplWithPublicInstanceScopeAnalysis.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/ImpactAnalyzerImplWithPublicInstanceScopeAnalysis.java
index ef94288..a6548b3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/ImpactAnalyzerImplWithPublicInstanceScopeAnalysis.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/ImpactAnalyzerImplWithPublicInstanceScopeAnalysis.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NavigationPathCreationTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NavigationPathCreationTest.java
index d302fd9..1688907 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NavigationPathCreationTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NavigationPathCreationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NavigationStepDebugGraphTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NavigationStepDebugGraphTest.java
index d495f3a..fb8e9eb 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NavigationStepDebugGraphTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NavigationStepDebugGraphTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NgpmModelBasedOclIaTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NgpmModelBasedOclIaTest.java
index bba449e..8e11ed6 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NgpmModelBasedOclIaTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/NgpmModelBasedOclIaTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/OclIaTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/OclIaTest.java
index 95aeecf..1c8db31 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/OclIaTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/OclIaTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2013 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/QuickOclParseAndEvalTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/QuickOclParseAndEvalTest.java
index 814687a..e7d44f5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/QuickOclParseAndEvalTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/QuickOclParseAndEvalTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/RevPathComputationTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/RevPathComputationTest.java
index fdde68e..f97ede1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/RevPathComputationTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/RevPathComputationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/TracebackStepTest.java b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/TracebackStepTest.java
index e6fe7df..b74de96 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/TracebackStepTest.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.tests/src/org/eclipse/ocl/examples/impactanalyzer/tests/instanceScope/TracebackStepTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/about.html b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/about.html
index e02cb11..a22e307 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/about.html
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.examples.impactanalyzer.testutils/build.properties b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/build.properties
index b94d20e..7a8a672 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/build.properties
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/plugin.properties b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/plugin.properties
index 9e04091..313060a 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/IncrementalResourceShrinker.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/IncrementalResourceShrinker.java
index d823688..63af067 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/IncrementalResourceShrinker.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/IncrementalResourceShrinker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelChangeSimulator.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelChangeSimulator.java
index e16fc8d..1171547 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelChangeSimulator.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelChangeSimulator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelCloner.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelCloner.java
index 6c0379f..7d3fa7f 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelCloner.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelCloner.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelReference.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelReference.java
index cb30d15..cc24cdd 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelReference.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ModelReference.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/PackageDependencyGraph.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/PackageDependencyGraph.java
index 66501e7..3bb7105 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/PackageDependencyGraph.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/PackageDependencyGraph.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ResourceTraversalHelper.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ResourceTraversalHelper.java
index da8f316..152d0f4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ResourceTraversalHelper.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ResourceTraversalHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ResourceWithSize.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ResourceWithSize.java
index eb0c666..bb12ea1 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ResourceWithSize.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ResourceWithSize.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ShrinkedResourceProvider.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ShrinkedResourceProvider.java
index cd2d57d..9fc5546 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ShrinkedResourceProvider.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/ShrinkedResourceProvider.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/VisitedPackages.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/VisitedPackages.java
index 558f7c6..7354d3b 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/VisitedPackages.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/VisitedPackages.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/XMIResourceWithSize.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/XMIResourceWithSize.java
index 6a40980..1a8990d 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/XMIResourceWithSize.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/model/XMIResourceWithSize.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/BenchmarkNotificationPreparer.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/BenchmarkNotificationPreparer.java
index 72ea78a..7e821c5 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/BenchmarkNotificationPreparer.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/BenchmarkNotificationPreparer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationForModelList.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationForModelList.java
index 02cb5e3..820e0d2 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationForModelList.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationForModelList.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationHelper.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationHelper.java
index 23af41e..68ceed4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationHelper.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationProducer.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationProducer.java
index a5b7f1e..c79e382 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationProducer.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationProducer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationResourceLoader.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationResourceLoader.java
index 21ac502..58c5378 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationResourceLoader.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/NotificationResourceLoader.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/RawNotification.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/RawNotification.java
index 8c4f856..6686d0e 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/RawNotification.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/RawNotification.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/RealWorldReplayNotificationProducer.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/RealWorldReplayNotificationProducer.java
index 499fef5..bf3f985 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/RealWorldReplayNotificationProducer.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/notifications/RealWorldReplayNotificationProducer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/BenchmarkOCLPreparer.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/BenchmarkOCLPreparer.java
index 1d55c74..45499d4 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/BenchmarkOCLPreparer.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/BenchmarkOCLPreparer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/EnvironmentFactory.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/EnvironmentFactory.java
index 6330f51..8febf95 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/EnvironmentFactory.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/EnvironmentFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionFromClassTcsPicker.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionFromClassTcsPicker.java
index e157fb9..47fbc66 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionFromClassTcsPicker.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionFromClassTcsPicker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionFromModelPicker.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionFromModelPicker.java
index 6e44f48..872beed 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionFromModelPicker.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionFromModelPicker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionPicker.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionPicker.java
index da5ebbc..f089c55 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionPicker.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionPicker.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionWithContext.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionWithContext.java
index 13e0d10..2782435 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionWithContext.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLExpressionWithContext.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLTestExpressionContainer.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLTestExpressionContainer.java
index 92f8cac..86be5d3 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLTestExpressionContainer.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/OCLTestExpressionContainer.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/Tuple.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/Tuple.java
index b2e953a..7e53963 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/Tuple.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/benchmark/preparation/ocl/Tuple.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/testutils/BaseDepartmentTestWithOCL.java b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/testutils/BaseDepartmentTestWithOCL.java
index 2362e2d..4107e56 100644
--- a/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/testutils/BaseDepartmentTestWithOCL.java
+++ b/tests/org.eclipse.ocl.examples.impactanalyzer.testutils/src/org/eclipse/ocl/examples/impactanalyzer/testutils/BaseDepartmentTestWithOCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.tests/about.html b/tests/org.eclipse.ocl.examples.tests/about.html
index 2f46c17..d75d996 100644
--- a/tests/org.eclipse.ocl.examples.tests/about.html
+++ b/tests/org.eclipse.ocl.examples.tests/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" 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.ocl.examples.tests/build.properties b/tests/org.eclipse.ocl.examples.tests/build.properties
index 1f1fe79..dd3ec2e 100644
--- a/tests/org.eclipse.ocl.examples.tests/build.properties
+++ b/tests/org.eclipse.ocl.examples.tests/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2011 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.tests/plugin.properties b/tests/org.eclipse.ocl.examples.tests/plugin.properties
index 62bff3b..0abedaa 100644
--- a/tests/org.eclipse.ocl.examples.tests/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2007, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/AllExamplesTests.java b/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/AllExamplesTests.java
index ce7bbc4..ea67ee8 100644
--- a/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/AllExamplesTests.java
+++ b/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/AllExamplesTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/EcoreTestFile.java b/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/EcoreTestFile.java
index 93ce4c9..bf66c45 100644
--- a/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/EcoreTestFile.java
+++ b/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/EcoreTestFile.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/EcoreTestFileBase.java b/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/EcoreTestFileBase.java
index e96fbcd..3367559 100644
--- a/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/EcoreTestFileBase.java
+++ b/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/EcoreTestFileBase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/OCLTestFile.java b/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/OCLTestFile.java
index d7521dd..feee693 100644
--- a/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/OCLTestFile.java
+++ b/tests/org.eclipse.ocl.examples.tests/src/org/eclipse/ocl/examples/test/editor/OCLTestFile.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.testutils/about.html b/tests/org.eclipse.ocl.examples.testutils/about.html
index e02cb11..a22e307 100644
--- a/tests/org.eclipse.ocl.examples.testutils/about.html
+++ b/tests/org.eclipse.ocl.examples.testutils/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.examples.testutils/build.properties b/tests/org.eclipse.ocl.examples.testutils/build.properties
index a00a0a9..0b166bc 100644
--- a/tests/org.eclipse.ocl.examples.testutils/build.properties
+++ b/tests/org.eclipse.ocl.examples.testutils/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.testutils/plugin.properties b/tests/org.eclipse.ocl.examples.testutils/plugin.properties
index 65c0d0e..c669d9e 100644
--- a/tests/org.eclipse.ocl.examples.testutils/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.testutils/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2011 SAP AG 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/BaseDepartmentTest.java b/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/BaseDepartmentTest.java
index 2f73d98..2228042 100644
--- a/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/BaseDepartmentTest.java
+++ b/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/BaseDepartmentTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/BaseTest.java b/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/BaseTest.java
index 454fce5..527d1bf 100644
--- a/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/BaseTest.java
+++ b/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/BaseTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  * E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/NotificationHelper.java b/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/NotificationHelper.java
index b71569c..f1fd7df 100644
--- a/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/NotificationHelper.java
+++ b/tests/org.eclipse.ocl.examples.testutils/src/org/eclipse/ocl/examples/testutils/NotificationHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 SAP AG 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *     SAP AG - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/about.html b/tests/org.eclipse.ocl.examples.validity.test/about.html
index 2f46c17..d75d996 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/about.html
+++ b/tests/org.eclipse.ocl.examples.validity.test/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" 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.ocl.examples.validity.test/build.properties b/tests/org.eclipse.ocl.examples.validity.test/build.properties
index f48ba5d..91437fc 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/build.properties
+++ b/tests/org.eclipse.ocl.examples.validity.test/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2014 Obeo 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #	Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EClass2.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EClass2.java
index ca0d468..27b8e2c 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EClass2.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EClass2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EClass3.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EClass3.java
index 344ab4a..3b00d69 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EClass3.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EClass3.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/Eclass1.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/Eclass1.java
index a160175..b709d6f 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/Eclass1.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/Eclass1.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EcoreTestFactory.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EcoreTestFactory.java
index 0f55d9e..2adc77c 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EcoreTestFactory.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EcoreTestFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EcoreTestPackage.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EcoreTestPackage.java
index 2971101..d8a5b32 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EcoreTestPackage.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/EcoreTestPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EClass2Impl.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EClass2Impl.java
index 70d5e91..0466907 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EClass2Impl.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EClass2Impl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EClass3Impl.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EClass3Impl.java
index f230aa9..c0e2bd8 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EClass3Impl.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EClass3Impl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/Eclass1Impl.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/Eclass1Impl.java
index ecd6ac0..216d871 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/Eclass1Impl.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/Eclass1Impl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EcoreTestFactoryImpl.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EcoreTestFactoryImpl.java
index e60835a..437a0b9 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EcoreTestFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EcoreTestFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EcoreTestPackageImpl.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EcoreTestPackageImpl.java
index d778a34..c832e0e 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EcoreTestPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/impl/EcoreTestPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestAdapterFactory.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestAdapterFactory.java
index 27ef544..80e3a62 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestSwitch.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestSwitch.java
index 31d8f51..dc29188 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestSwitch.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest/util/EcoreTestSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/Eclass5.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/Eclass5.java
index 0b08acd..4bd3dc4 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/Eclass5.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/Eclass5.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/EcoreTest2Factory.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/EcoreTest2Factory.java
index 86443e8..a37c800 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/EcoreTest2Factory.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/EcoreTest2Factory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/EcoreTest2Package.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/EcoreTest2Package.java
index f2b2da1..d222d1d 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/EcoreTest2Package.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/EcoreTest2Package.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/Eclass5Impl.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/Eclass5Impl.java
index 79a443d..7ba2901 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/Eclass5Impl.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/Eclass5Impl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/EcoreTest2FactoryImpl.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/EcoreTest2FactoryImpl.java
index dde743d..3fb0ec0 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/EcoreTest2FactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/EcoreTest2FactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/EcoreTest2PackageImpl.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/EcoreTest2PackageImpl.java
index 26c9c65..5158d06 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/EcoreTest2PackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/impl/EcoreTest2PackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2AdapterFactory.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2AdapterFactory.java
index 7013ba3..6308444 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2AdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2AdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2Switch.java b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2Switch.java
index 9f88cf3..6fc3a76 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2Switch.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/emf-gen/org/eclipse/ocl/examples/validity/test/ecoreTest2/util/EcoreTest2Switch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/plugin.properties b/tests/org.eclipse.ocl.examples.validity.test/plugin.properties
index 37be06b..d08ebc6 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.validity.test/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Obeo 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #	Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AbstractExportOCLValidationResultTests.java b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AbstractExportOCLValidationResultTests.java
index fbb077b..e60f268 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AbstractExportOCLValidationResultTests.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AbstractExportOCLValidationResultTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AbstractValidityTestCase.java b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AbstractValidityTestCase.java
index 4557aec..afe1b2c 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AbstractValidityTestCase.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AbstractValidityTestCase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AllValidityTests.java b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AllValidityTests.java
index a5e9cec..b059d27 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AllValidityTests.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/AllValidityTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink (CEA LIST) - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/HTMLExportOCLValidationResultTests.java b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/HTMLExportOCLValidationResultTests.java
index 6813191..9301da5 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/HTMLExportOCLValidationResultTests.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/HTMLExportOCLValidationResultTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/TextExportOCLValidationResultTests.java b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/TextExportOCLValidationResultTests.java
index 3dc676d..342669f 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/TextExportOCLValidationResultTests.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/TextExportOCLValidationResultTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/ValidityManagerTests.java b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/ValidityManagerTests.java
index e62a3a2..e19df66 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/ValidityManagerTests.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/ValidityManagerTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/ValidityModelTests.java b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/ValidityModelTests.java
index cf7c374..dc05ffe 100644
--- a/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/ValidityModelTests.java
+++ b/tests/org.eclipse.ocl.examples.validity.test/src/org/eclipse/ocl/examples/validity/test/ValidityModelTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2015 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/about.html b/tests/org.eclipse.ocl.examples.xtext.tests/about.html
index 2f46c17..d75d996 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/about.html
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/about.html
@@ -13,7 +13,7 @@
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
 Eclipse Public License Version 1.0 ("EPL").  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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
 For purposes of the EPL, "Program" 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.ocl.examples.xtext.tests/build.properties b/tests/org.eclipse.ocl.examples.xtext.tests/build.properties
index 6f4881e..9059046 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/build.properties
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/log4j.properties b/tests/org.eclipse.ocl.examples.xtext.tests/log4j.properties
index 4c05732..b6af6f0 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/log4j.properties
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/log4j.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/model/CodeGenCompany.genmodel b/tests/org.eclipse.ocl.examples.xtext.tests/model/CodeGenCompany.genmodel
index 12ec6bd..b41b7bb 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/model/CodeGenCompany.genmodel
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/model/CodeGenCompany.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="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2015, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2015, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved.   This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.ocl.examples.xtext.tests/src-gen" modelPluginID="org.eclipse.ocl.examples.xtext.tests"
     forceOverwrite="true" modelName="Company" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
     bundleManifest="false" complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7"
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/model/CodeGenCompanySrc.genmodel b/tests/org.eclipse.ocl.examples.xtext.tests/model/CodeGenCompanySrc.genmodel
index be0ff65..c3384c8 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/model/CodeGenCompanySrc.genmodel
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/model/CodeGenCompanySrc.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="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2015, 2018 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2015, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved.   This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v20.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.ocl.examples.xtext.tests/src" modelPluginID="org.eclipse.ocl.examples.xtext.tests"
     forceOverwrite="true" modelName="Company" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
     bundleManifest="false" complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7"
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/models/RoyalAndLoyal.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/models/RoyalAndLoyal.ocl
index 79ab61c..0a0a767 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/models/RoyalAndLoyal.ocl
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/models/RoyalAndLoyal.ocl
@@ -1,9 +1,9 @@
 --------------------------------------------------------------------------------
 -- Copyright (c) 2007,2008 M.Garcia 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 v2.0
 -- which accompanies this distribution, and is available at
--- http://www.eclipse.org/legal/epl-v10.html
+-- http://www.eclipse.org/legal/epl-v20.html
 --
 -- Contributors:
 --     J.Warmer, A.Kleppe - original example in 'The Object Constraint Language Second Edition'
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/plugin.properties b/tests/org.eclipse.ocl.examples.xtext.tests/plugin.properties
index 72813e5..acdf5ba 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/plugin.properties
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/A.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/A.java
index 311257f..63b8fbb 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/A.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/A.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/Bug477283AFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/Bug477283AFactory.java
index 3311e7f..abc022f 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/Bug477283AFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/Bug477283AFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/Bug477283APackage.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/Bug477283APackage.java
index 3a35358..373d81d 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/Bug477283APackage.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/Bug477283APackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/ASub.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/ASub.java
index 52eaf63..8f75c5b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/ASub.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/ASub.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/Bug477283subFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/Bug477283subFactory.java
index c103e79..2ea4d1a 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/Bug477283subFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/Bug477283subFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/Bug477283subPackage.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/Bug477283subPackage.java
index 137df52..ad107a1 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/Bug477283subPackage.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/Bug477283subPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/ASubSub.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/ASubSub.java
index 9b35eb0..6a32bd2 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/ASubSub.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/ASubSub.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/Bug477283AsubsubFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/Bug477283AsubsubFactory.java
index 374bf21..2e19bc0 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/Bug477283AsubsubFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/Bug477283AsubsubFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/Bug477283AsubsubPackage.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/Bug477283AsubsubPackage.java
index dd185e2..db00613 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/Bug477283AsubsubPackage.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/Bug477283AsubsubPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/ASubSubImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/ASubSubImpl.java
index e694cf6..b4f549b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/ASubSubImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/ASubSubImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/Bug477283AsubsubFactoryImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/Bug477283AsubsubFactoryImpl.java
index 439460b..25d63a6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/Bug477283AsubsubFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/Bug477283AsubsubFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/Bug477283AsubsubPackageImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/Bug477283AsubsubPackageImpl.java
index 722e9d2..6918cab 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/Bug477283AsubsubPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/impl/Bug477283AsubsubPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/util/Bug477283AsubsubAdapterFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/util/Bug477283AsubsubAdapterFactory.java
index 05adcf4..8a908a3 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/util/Bug477283AsubsubAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/util/Bug477283AsubsubAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/util/Bug477283AsubsubSwitch.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/util/Bug477283AsubsubSwitch.java
index 18d12f9..20aa741 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/util/Bug477283AsubsubSwitch.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/asubsub/util/Bug477283AsubsubSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/ASubImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/ASubImpl.java
index 00f0e19..052e682 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/ASubImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/ASubImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/Bug477283subFactoryImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/Bug477283subFactoryImpl.java
index c9cd92f..79afb06 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/Bug477283subFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/Bug477283subFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/Bug477283subPackageImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/Bug477283subPackageImpl.java
index 0e37c66..04999ee 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/Bug477283subPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/impl/Bug477283subPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/util/Bug477283subAdapterFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/util/Bug477283subAdapterFactory.java
index 6159349..fd47829 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/util/Bug477283subAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/util/Bug477283subAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/util/Bug477283subSwitch.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/util/Bug477283subSwitch.java
index 4e09cbe..dd05e9e 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/util/Bug477283subSwitch.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/asub/util/Bug477283subSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/AImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/AImpl.java
index c978e76..37a4738 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/AImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/AImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/Bug477283AFactoryImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/Bug477283AFactoryImpl.java
index c4690fd..87c0129 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/Bug477283AFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/Bug477283AFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/Bug477283APackageImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/Bug477283APackageImpl.java
index df30b26..0244e3f 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/Bug477283APackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/impl/Bug477283APackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/util/Bug477283AAdapterFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/util/Bug477283AAdapterFactory.java
index 129040b..9617bc8 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/util/Bug477283AAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/util/Bug477283AAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/util/Bug477283ASwitch.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/util/Bug477283ASwitch.java
index 9b56dc9..31be7a3 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/util/Bug477283ASwitch.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/a/util/Bug477283ASwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/B.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/B.java
index 29428fb..9a16a8b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/B.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/B.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/Bug477283BFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/Bug477283BFactory.java
index a415ba3..3e0198a 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/Bug477283BFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/Bug477283BFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/Bug477283BPackage.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/Bug477283BPackage.java
index 18651d5..32d14f4 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/Bug477283BPackage.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/Bug477283BPackage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/BImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/BImpl.java
index fb98fd4..e6d3bb9 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/BImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/BImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/Bug477283BFactoryImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/Bug477283BFactoryImpl.java
index 786c2b1..eb1272c 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/Bug477283BFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/Bug477283BFactoryImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/Bug477283BPackageImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/Bug477283BPackageImpl.java
index 4844d9d..9927469 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/Bug477283BPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/impl/Bug477283BPackageImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/util/Bug477283BAdapterFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/util/Bug477283BAdapterFactory.java
index 7f76cab..9f1f7db 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/util/Bug477283BAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/util/Bug477283BAdapterFactory.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/util/Bug477283BSwitch.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/util/Bug477283BSwitch.java
index 24c2efa..fa0c342 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/util/Bug477283BSwitch.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/bug477283/b/util/Bug477283BSwitch.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Bug418716.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Bug418716.java
index 876fe90..7c4e9d6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Bug418716.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Bug418716.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyFactory.java
index 1049ead..97bd085 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyFactory.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyPackage.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyPackage.java
index 42ebc13..8cbdcac 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyPackage.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyPackage.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyTables.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyTables.java
index c1223b8..e24bf83 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyTables.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CodegencompanyTables.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Company.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Company.java
index 10c6d5f..9687dd7 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Company.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Company.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CompanySizeKind.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CompanySizeKind.java
index caa611d..51e7322 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CompanySizeKind.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/CompanySizeKind.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Employee.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Employee.java
index 4002aba..b041fdc 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Employee.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/Employee.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/Bug418716Impl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/Bug418716Impl.java
index 5cbf7b0..dba251d 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/Bug418716Impl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/Bug418716Impl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CodegencompanyFactoryImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CodegencompanyFactoryImpl.java
index 0f4b29b..817627d 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CodegencompanyFactoryImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CodegencompanyFactoryImpl.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CodegencompanyPackageImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CodegencompanyPackageImpl.java
index 72f71f8..bb586ca 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CodegencompanyPackageImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CodegencompanyPackageImpl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CompanyImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CompanyImpl.java
index 14ea047..46c8e6a 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CompanyImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/CompanyImpl.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/EmployeeImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/EmployeeImpl.java
index 5dda88f..049916e 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/EmployeeImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/impl/EmployeeImpl.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanyAdapterFactory.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanyAdapterFactory.java
index d4008b2..f5e3ecd 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanyAdapterFactory.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanyAdapterFactory.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanySwitch.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanySwitch.java
index ee71dd4..0e28da5 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanySwitch.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanySwitch.java
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanyValidator.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanyValidator.java
index 6bcf802..031aea6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanyValidator.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/util/CodegencompanyValidator.java
@@ -3,9 +3,9 @@
  * 
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/validation/CompanyValidator.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/validation/CompanyValidator.java
index 532e9ac..4742e73 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/validation/CompanyValidator.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/validation/CompanyValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/validation/EmployeeValidator.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/validation/EmployeeValidator.java
index e73b972..56441b5 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/validation/EmployeeValidator.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/codegen/company/validation/EmployeeValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/company/Bug418716.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/company/Bug418716.java
index 2780224..4e11f0b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/company/Bug418716.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/company/Bug418716.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/company/impl/Bug418716Impl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/company/impl/Bug418716Impl.java
index ff769a1..1564222 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/company/impl/Bug418716Impl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/company/impl/Bug418716Impl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/noreflectioncompany/validation/CompanyValidator.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/noreflectioncompany/validation/CompanyValidator.java
index 8b4a8cb..0683dba 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/noreflectioncompany/validation/CompanyValidator.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/noreflectioncompany/validation/CompanyValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/noreflectioncompany/validation/EmployeeValidator.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/noreflectioncompany/validation/EmployeeValidator.java
index 1656f86..df1f98b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/noreflectioncompany/validation/EmployeeValidator.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/noreflectioncompany/validation/EmployeeValidator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/AbstractValidateTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/AbstractValidateTests.java
index 9462431..78c67ad 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/AbstractValidateTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/AbstractValidateTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/DelegatesTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/DelegatesTest.java
index 3bcf83c..79aab28 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/DelegatesTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/DelegatesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateBooleanOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateBooleanOperationsTest.java
index e217994..97f0c85 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateBooleanOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateBooleanOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateBooleanOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateBooleanOperationsTest4.java
index 512991e..78ee373 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateBooleanOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateBooleanOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest.java
index f3eb635..22f0c83 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest4.java
index 670e20b..62d6120 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateCollectionOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateCollectionOperationsTest.java
index 275bb83..4205457 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateCollectionOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateCollectionOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateCollectionOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateCollectionOperationsTest4.java
index 4da17f4..d691e2e 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateCollectionOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateCollectionOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateConstructsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateConstructsTest.java
index fbf073b..ca47645 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateConstructsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateConstructsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateConstructsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateConstructsTest4.java
index 53bbff3..13269c4 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateConstructsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateConstructsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateMapOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateMapOperationsTest.java
index fb4ce8f..d8f7281 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateMapOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateMapOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateMapOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateMapOperationsTest4.java
index ff756a9..6f55d53 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateMapOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateMapOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateModelOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateModelOperationsTest.java
index a730a95..8745008 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateModelOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateModelOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateModelOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateModelOperationsTest4.java
index 8e91333..a9b198f 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateModelOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateModelOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNameVisibilityTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNameVisibilityTest.java
index 015767b..fc29417 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNameVisibilityTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNameVisibilityTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNameVisibilityTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNameVisibilityTest4.java
index d441c7b..2d24918 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNameVisibilityTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNameVisibilityTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNumericOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNumericOperationsTest.java
index 4271877..f67121b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNumericOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNumericOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNumericOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNumericOperationsTest4.java
index 5bc6f6e..074d816 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNumericOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateNumericOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest.java
index 12ebc59..afdcf28 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest4.java
index c5567c2..1eb7bf4 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateStringOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateStringOperationsTest.java
index 808fe33..4ff4109 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateStringOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateStringOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateStringOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateStringOperationsTest4.java
index 6f66491..d116b6e 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateStringOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateStringOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateTupleOperationsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateTupleOperationsTest.java
index 68f2e44..db83309 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateTupleOperationsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateTupleOperationsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateTupleOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateTupleOperationsTest4.java
index 3cd39b3..4dba704 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateTupleOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateTupleOperationsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateUMLTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateUMLTest.java
index 00c1fc5..358bcfa 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateUMLTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateUMLTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateUMLTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateUMLTest4.java
index 34a0634..e465646 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateUMLTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateUMLTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/InheritanceTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/InheritanceTests.java
index 3a737d7..8d7e173 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/InheritanceTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/InheritanceTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/IteratorsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/IteratorsTest.java
index ebe646f..fa7fd05 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/IteratorsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/IteratorsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/IteratorsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/IteratorsTest4.java
index 2a7a609..277351f 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/IteratorsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/IteratorsTest4.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/LeakTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/LeakTests.java
index 28568d1..dfbdaa4 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/LeakTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/LeakTests.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2015, 2018 Christian W. Damus 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Christian W. Damus - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/MoreDelegatesTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/MoreDelegatesTest.java
index 96e1527..61a89eb 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/MoreDelegatesTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/MoreDelegatesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotFruitTestSuite.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotFruitTestSuite.java
index 437e247..3e1d2a6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotFruitTestSuite.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotFruitTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestCase.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestCase.java
index f3838cd..32033cc 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestCase.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestCase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestCaseWithAutoTearDown.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestCaseWithAutoTearDown.java
index b44d0b0..4972422 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestCaseWithAutoTearDown.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestCaseWithAutoTearDown.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestSuite.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestSuite.java
index 343fa5e..4e1d118 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestSuite.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PivotTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PrettyPrinterTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PrettyPrinterTest.java
index d8a2ad4..981b881 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PrettyPrinterTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/PrettyPrinterTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/StereotypesTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/StereotypesTest.java
index da8f80c..08d7ded 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/StereotypesTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/StereotypesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/TestOCL.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/TestOCL.java
index 2f69816..1921f57 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/TestOCL.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/TestOCL.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java
index a582170..64b211b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/ValidateTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/ValidateTests.java
index ea018d4..a2f8ec1 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/ValidateTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/ValidateTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/models/Bug404882.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/models/Bug404882.ocl
index 12c5c62..070600c 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/models/Bug404882.ocl
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/models/Bug404882.ocl
@@ -3,9 +3,9 @@
  *
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/models/ExtraUMLValidation.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/models/ExtraUMLValidation.ocl
index 76facd9..39f432d 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/models/ExtraUMLValidation.ocl
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/models/ExtraUMLValidation.ocl
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/AbstractProjectMapTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/AbstractProjectMapTest.java
index 4ac49d4..2e4763f 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/AbstractProjectMapTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/AbstractProjectMapTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/DebugTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/DebugTest.java
index acb9904..61dfdf5 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/DebugTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/DebugTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/KeywordsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/KeywordsTest.java
index cc4a2c6..743d8ea 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/KeywordsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/KeywordsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/ParserBacktrackingTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/ParserBacktrackingTest.java
index 9872cd4..f9d4016 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/ParserBacktrackingTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/ParserBacktrackingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/ProjectMapTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/ProjectMapTest.java
index 1ed7f86..c45782f 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/ProjectMapTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/ecore/ProjectMapTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericDebugTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericDebugTest.java
index c4e5d21..5c40c31 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericDebugTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericDebugTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 Eclipse Modeling Project 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   L.Goubet, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericFruitTestSuite.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericFruitTestSuite.java
index 9c3e239..f71e58b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericFruitTestSuite.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericFruitTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Bug 254919; Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericKeywordsTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericKeywordsTest.java
index d84a02a..dbd0a0b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericKeywordsTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericKeywordsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericParserBacktrackingTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericParserBacktrackingTest.java
index 2c2775a..fdee2f6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericParserBacktrackingTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/generic/GenericParserBacktrackingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/AllLabelTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/AllLabelTests.java
index 6d9699a..995dfc9 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/AllLabelTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/AllLabelTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2014 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/LabelTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/LabelTests.java
index f316a21..d12aea1 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/LabelTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/LabelTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/PluginLabelTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/PluginLabelTests.java
index 8b4973d..4b903de 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/PluginLabelTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/PluginLabelTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/StandaloneLabelTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/StandaloneLabelTests.java
index be87810..bf674e3 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/StandaloneLabelTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/label/StandaloneLabelTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneExecutionTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneExecutionTests.java
index effbb10..ee69e5e 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneExecutionTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneExecutionTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneParserTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneParserTests.java
index 1b27331..636440c 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneParserTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneParserTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneTestCase.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneTestCase.java
index 27320cd..9a293ad 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneTestCase.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/StandaloneTestCase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/models/EcoreTestFile.ecore b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/models/EcoreTestFile.ecore
index 87d3dcf..656f7c3 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/models/EcoreTestFile.ecore
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/standalone/models/EcoreTestFile.ecore
@@ -3,7 +3,7 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="Bad" nsURI="platform:/resource/org.eclipse.ocl.examples.project.completeocltutorial/model/Bad.ecore"
     nsPrefix="pfx">
   <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="&lt;copyright>&#xA;&#xA;Copyright (c) 2012 Willink Transformations and others.&#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;  E.D.Willink - Initial API and implementation&#xA;&#xA;&lt;/copyright>&#xA;&#xA;This Ecore file contains a number of problems for diagnosis as part of the Complete OCL Tutorial."/>
+    <details key="documentation" value="&lt;copyright>&#xA;&#xA;Copyright (c) 2012 Willink Transformations and others.&#xA;All rights reserved.   This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v2.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v20.html&#xA;&#xA;Contributors:&#xA;  E.D.Willink - Initial API and implementation&#xA;&#xA;&lt;/copyright>&#xA;&#xA;This Ecore file contains a number of problems for diagnosis as part of the Complete OCL Tutorial."/>
   </eAnnotations>
   <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
     <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractConsoleTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractConsoleTests.java
index 7533cd1..fc0679b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractConsoleTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractConsoleTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractGrammarTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractGrammarTests.java
index d4543fd..bd5c7fd 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractGrammarTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractGrammarTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractModels.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractModels.java
index dcdf185..ccf6d17 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractModels.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AbstractModels.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AllEvaluationTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AllEvaluationTests.java
index b3fc881..ce178b4 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AllEvaluationTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AllEvaluationTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AllXtextTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AllXtextTests.java
index ae28d0e..f211fff 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AllXtextTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/AllXtextTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/CompletionProposalTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/CompletionProposalTests.java
index fbf08b5..5a27a8b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/CompletionProposalTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/CompletionProposalTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ConsoleTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ConsoleTests.java
index dbd2059..32ad793 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ConsoleTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ConsoleTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/DebuggerTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/DebuggerTests.java
index 8648e57..e9fcb1d 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/DebuggerTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/DebuggerTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EMFURIEditorInput.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EMFURIEditorInput.java
index ea0e25f..fe8f66f 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EMFURIEditorInput.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EMFURIEditorInput.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation (based on URIEditorInput)
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EcoreConsoleTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EcoreConsoleTests.java
index b9cbf4e..a666d3d 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EcoreConsoleTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EcoreConsoleTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditTests.java
index dbccaf3..0eb2dc4 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditorTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditorTests.java
index 435a5a3..d3aa28a 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditorTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditorTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ErrorTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ErrorTests.java
index fce1425..efe1ed1 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ErrorTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ErrorTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FileNewWizardTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FileNewWizardTest.java
index 1d0662f..59f5efc 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FileNewWizardTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FileNewWizardTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2018 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FinalTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FinalTests.java
index 139d3b0..a2a4ae4 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FinalTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FinalTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FlowAnalysisTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FlowAnalysisTests.java
index 63982d6..7ef1871 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FlowAnalysisTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/FlowAnalysisTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/GlobalRegistries2.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/GlobalRegistries2.java
index 6199b45..ba9f6d9 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/GlobalRegistries2.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/GlobalRegistries2.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2017 itemis AG (http://www.itemis.eu) 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *******************************************************************************/
 package org.eclipse.ocl.examples.test.xtext;
 
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/GrammarTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/GrammarTests.java
index 4cf636f..06f6a4e 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/GrammarTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/GrammarTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ImportTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ImportTests.java
index 5187c55..f33523a 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ImportTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ImportTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
index c69c3ea..a1b6fa2 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MarkupTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MarkupTests.java
index bd8c99f..ba957fb 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MarkupTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MarkupTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MonikerTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MonikerTests.java
index 6360a37..d1505b3 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MonikerTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MonikerTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MoreSerializeTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MoreSerializeTests.java
index f9ce254..a50093d 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MoreSerializeTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/MoreSerializeTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/OCLinEcoreTutorialExamples.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/OCLinEcoreTutorialExamples.java
index bb106cd..e4e85fb 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/OCLinEcoreTutorialExamples.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/OCLinEcoreTutorialExamples.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/OCLstdlibTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/OCLstdlibTests.java
index afec8e3..b80a79e 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/OCLstdlibTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/OCLstdlibTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotDocumentationExamples.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotDocumentationExamples.java
index 87e8738..c5acfa7 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotDocumentationExamples.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotDocumentationExamples.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *  E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotTests.java
index 75b2f4f..9fe6b27 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PrecedenceTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PrecedenceTests.java
index 3417f47..2003df5 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PrecedenceTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PrecedenceTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RegistryTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RegistryTests.java
index e5ee146..a9efe56 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RegistryTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RegistryTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink (Obeo) - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
index 7125cf0..cbb65e6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/SerializeTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/SerializeTests.java
index 50a2409..5fe2e61 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/SerializeTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/SerializeTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/TestPrettyPrinter.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/TestPrettyPrinter.java
index 58e13c2..b72b4d6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/TestPrettyPrinter.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/TestPrettyPrinter.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D. Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UML25LoadTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UML25LoadTests.java
index d8d92a5..94d44f6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UML25LoadTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UML25LoadTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UMLConsoleTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UMLConsoleTests.java
index f23a66e..c0e05ff 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UMLConsoleTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UMLConsoleTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UsageTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UsageTests.java
index 8bb4098..9f9accd 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UsageTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/UsageTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2012, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/models/ParserModels.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/models/ParserModels.java
index 31720e3..3e4a793 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/models/ParserModels.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/models/ParserModels.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/models/RoyalAndLoyal.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/models/RoyalAndLoyal.ocl
index 79ab61c..0a0a767 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/models/RoyalAndLoyal.ocl
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/models/RoyalAndLoyal.ocl
@@ -1,9 +1,9 @@
 --------------------------------------------------------------------------------
 -- Copyright (c) 2007,2008 M.Garcia 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 v2.0
 -- which accompanies this distribution, and is available at
--- http://www.eclipse.org/legal/epl-v10.html
+-- http://www.eclipse.org/legal/epl-v20.html
 --
 -- Contributors:
 --     J.Warmer, A.Kleppe - original example in 'The Object Constraint Language Second Edition'
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/Activator.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/Activator.java
index 184c7fb..7179711 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/Activator.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/Activator.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/JUnitPluginFileSystem.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/JUnitPluginFileSystem.java
index ae093e6..1153c94 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/JUnitPluginFileSystem.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/JUnitPluginFileSystem.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/JUnitStandaloneFileSystem.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/JUnitStandaloneFileSystem.java
index b308f10..95163f8 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/JUnitStandaloneFileSystem.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/JUnitStandaloneFileSystem.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/NoHttpURIHandlerImpl.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/NoHttpURIHandlerImpl.java
index 5df4f3c..280d44e 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/NoHttpURIHandlerImpl.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/NoHttpURIHandlerImpl.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2016 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/StandaloneExtraProjectsManager.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/StandaloneExtraProjectsManager.java
index 76b659a..926eb85 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/StandaloneExtraProjectsManager.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/StandaloneExtraProjectsManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestCaseAppender.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestCaseAppender.java
index 9d207ec..a7d371b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestCaseAppender.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestCaseAppender.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestCaseLogger.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestCaseLogger.java
index 74d4a71..808b413 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestCaseLogger.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestCaseLogger.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFile.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFile.java
index ae6deda..59213ff 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFile.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFile.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFileSystem.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFileSystem.java
index 726a16f..d5a87e8 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFileSystem.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFileSystem.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFileSystemHelper.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFileSystemHelper.java
index 90070fa..8a529e1 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFileSystemHelper.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestFileSystemHelper.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestProject.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestProject.java
index e213a82..635e9cb 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestProject.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestProject.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestProjectManager.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestProjectManager.java
index f04711b..5362cf5 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestProjectManager.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestProjectManager.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUIUtil.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUIUtil.java
index 6401662..7ff1a53 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUIUtil.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUIUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUtil.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUtil.java
index ad668ec..6ef0199 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUtil.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2015, 2018 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/XtextTestCase.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/XtextTestCase.java
index 3279742..f9fa4d6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/XtextTestCase.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/XtextTestCase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/XtextVersionUtil.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/XtextVersionUtil.java
index 24d2079..dec5f39 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/XtextVersionUtil.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/XtextVersionUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2015 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *  C.Damus, K.Hussey, E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/about.html b/tests/org.eclipse.ocl.tests/about.html
index 9deb572..68d9e64 100644
--- a/tests/org.eclipse.ocl.tests/about.html
+++ b/tests/org.eclipse.ocl.tests/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.tests/about.properties b/tests/org.eclipse.ocl.tests/about.properties
index 833bbae..e929ae6 100644
--- a/tests/org.eclipse.ocl.tests/about.properties
+++ b/tests/org.eclipse.ocl.tests/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2006, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/build.properties b/tests/org.eclipse.ocl.tests/build.properties
index 8d6105f..8fcdb2e 100644
--- a/tests/org.eclipse.ocl.tests/build.properties
+++ b/tests/org.eclipse.ocl.tests/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2013, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/plugin.properties b/tests/org.eclipse.ocl.tests/plugin.properties
index 13c1339..54b35ee 100644
--- a/tests/org.eclipse.ocl.tests/plugin.properties
+++ b/tests/org.eclipse.ocl.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2009, 2014 Willink Transformations 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationBooleanOperationTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationBooleanOperationTest.java
index e80e09c..cf4560c 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationBooleanOperationTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationBooleanOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2009, 2012 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationCollectionOperationTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationCollectionOperationTest.java
index e316d52..fcba7d9 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationCollectionOperationTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationCollectionOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2009, 2012 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationNumberOperationTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationNumberOperationTest.java
index 6ec2295..a6804a4 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationNumberOperationTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationNumberOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2009, 2017 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationOclAnyOperationTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationOclAnyOperationTest.java
index b954657..c31ac2e 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationOclAnyOperationTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationOclAnyOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2009, 2012 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationStringOperationTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationStringOperationTest.java
index b17a061..dd258ea 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationStringOperationTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationStringOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2009, 2013 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationTestSuite.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationTestSuite.java
index 4f74d06..00285ef 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationTestSuite.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericEvaluationTestSuite.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2009, 2012 Obeo 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Obeo - initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericFruitTestSuite.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericFruitTestSuite.java
index 24570b1..222ec0e 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericFruitTestSuite.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericFruitTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Bug 254919; Initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericInitializedFruitTestSuite.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericInitializedFruitTestSuite.java
index aa1c1ab..bf60a26 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericInitializedFruitTestSuite.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericInitializedFruitTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Bug 254919; Initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericIteratorsTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericIteratorsTest.java
index d7d104b..9c53ea9 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericIteratorsTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericIteratorsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2016 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericKeywordsTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericKeywordsTest.java
index 7ecf13c..0545941 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericKeywordsTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericKeywordsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericParserBacktrackingTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericParserBacktrackingTest.java
index fe9f593..518c913 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericParserBacktrackingTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericParserBacktrackingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericTestSuite.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericTestSuite.java
index f694875..75e97bc 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericTestSuite.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericTuplesTest.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericTuplesTest.java
index 55e8d90..0a50e42 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericTuplesTest.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/GenericTuplesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2012 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/TestReflection.java b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/TestReflection.java
index f3c7657..abb1372 100644
--- a/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/TestReflection.java
+++ b/tests/org.eclipse.ocl.tests/src/org/eclipse/ocl/tests/TestReflection.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/about.html b/tests/org.eclipse.ocl.uml.tests/about.html
index c0be2e9..e9d1dac 100644
--- a/tests/org.eclipse.ocl.uml.tests/about.html
+++ b/tests/org.eclipse.ocl.uml.tests/about.html
@@ -14,7 +14,7 @@
 <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>.
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</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.ocl.uml.tests/about.properties b/tests/org.eclipse.ocl.uml.tests/about.properties
index b946b63..a74cb2c 100644
--- a/tests/org.eclipse.ocl.uml.tests/about.properties
+++ b/tests/org.eclipse.ocl.uml.tests/about.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/build.properties b/tests/org.eclipse.ocl.uml.tests/build.properties
index d2ef1be..c0be8d0 100644
--- a/tests/org.eclipse.ocl.uml.tests/build.properties
+++ b/tests/org.eclipse.ocl.uml.tests/build.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/plugin.properties b/tests/org.eclipse.ocl.uml.tests/plugin.properties
index 761fe39..204d466 100644
--- a/tests/org.eclipse.ocl.uml.tests/plugin.properties
+++ b/tests/org.eclipse.ocl.uml.tests/plugin.properties
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2005, 2014 IBM Corporation 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 v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/AbstractTestSuite.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/AbstractTestSuite.java
index b90797e..f4633f5 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/AbstractTestSuite.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/AbstractTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/EvaluationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/EvaluationTest.java
index b3a8852..3d28131 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/EvaluationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/EvaluationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/OCLHelperTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/OCLHelperTest.java
index 7c5444a..c6d57b2 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/OCLHelperTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/OCLHelperTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/ParsingTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/ParsingTest.java
index 9bd9b19..78e8fcf 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/ParsingTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/ParsingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/RegressionTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/RegressionTest.java
index 138a65f..d65971c 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/RegressionTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/RegressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/SyntaxHelpTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/SyntaxHelpTest.java
index 77968b1..8b06f44 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/SyntaxHelpTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/helper/tests/SyntaxHelpTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AbstractTestSuite.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AbstractTestSuite.java
index 7ccfe31..190491e 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AbstractTestSuite.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AbstractTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AllTests.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AllTests.java
index 5844043..8636f30 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AllTests.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AllTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2002, 2013 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AllTestsBacktracking.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AllTestsBacktracking.java
index f458e7d..95fcb11 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AllTestsBacktracking.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AllTestsBacktracking.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2013 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AssociationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AssociationTest.java
index 5b5b23d..a559467 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AssociationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/AssociationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/BasicOCLTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/BasicOCLTest.java
index cd00fa8..d012983 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/BasicOCLTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/BasicOCLTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/CollectionsTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/CollectionsTest.java
index 13c088f..c53f20c 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/CollectionsTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/CollectionsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2011, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ComparisonTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ComparisonTest.java
index 085971d..1be84ad 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ComparisonTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ComparisonTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/DefExpressionTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/DefExpressionTest.java
index 8f734da..d073a6f 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/DefExpressionTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/DefExpressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationBooleanOperationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationBooleanOperationTest.java
index 5f1b89c..e1afd3c 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationBooleanOperationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationBooleanOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationCollectionOperationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationCollectionOperationTest.java
index d2f7fee..3234ba9 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationCollectionOperationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationCollectionOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationHaltedTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationHaltedTest.java
index d531ddc..7eaacd3 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationHaltedTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationHaltedTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2011 Borland Software Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     Radek Dvorak - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationNumberOperationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationNumberOperationTest.java
index 6a74193..e48b48c 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationNumberOperationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationNumberOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationOclAnyOperationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationOclAnyOperationTest.java
index 89795d8..b81fc02 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationOclAnyOperationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationOclAnyOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationStringOperationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationStringOperationTest.java
index 768153a..17ee0b4 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationStringOperationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/EvaluationStringOperationTest.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *     E.D.Willink - initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ExpressionsValidatorTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ExpressionsValidatorTest.java
index 7c1f29a..f71fe0d 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ExpressionsValidatorTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ExpressionsValidatorTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 IBM Corporation, Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/FeatureRedefinitionTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/FeatureRedefinitionTest.java
index e7ebf3c..0273e79 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/FeatureRedefinitionTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/FeatureRedefinitionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2009 Stefan Schulze, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   Stefan Schulze - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/InitOrDerExpressionTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/InitOrDerExpressionTest.java
index 0b3d405..23d0269 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/InitOrDerExpressionTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/InitOrDerExpressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/InvariantConstraintsTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/InvariantConstraintsTest.java
index 7b74e19..43782aa 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/InvariantConstraintsTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/InvariantConstraintsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/IteratorsTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/IteratorsTest.java
index 9e7a2bd..2442917 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/IteratorsTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/IteratorsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/KeywordsTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/KeywordsTest.java
index c5cfc69..373a22f 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/KeywordsTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/KeywordsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/LocationInformationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/LocationInformationTest.java
index 6f3a357..9cecae4 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/LocationInformationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/LocationInformationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/MessagesTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/MessagesTest.java
index 6e84d89..149c02b 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/MessagesTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/MessagesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/OCLDocumentTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/OCLDocumentTest.java
index 5d64362..b7e2408 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/OCLDocumentTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/OCLDocumentTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/OperationConstraintsTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/OperationConstraintsTest.java
index 54f4ebd..5a672d3 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/OperationConstraintsTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/OperationConstraintsTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ParserBacktrackingTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ParserBacktrackingTest.java
index c0fbf75..aed955e 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ParserBacktrackingTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ParserBacktrackingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/PrecedenceTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/PrecedenceTest.java
index 9d259f3..6ad6020 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/PrecedenceTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/PrecedenceTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/PrimitiveTypesTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/PrimitiveTypesTest.java
index 9f2f928..62ff4dc 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/PrimitiveTypesTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/PrimitiveTypesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2011, 2011 IBM Corporation, Open Canarias S.L. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ProfilesTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ProfilesTest.java
index 00d3fcf..67729ec 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ProfilesTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ProfilesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2011 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/RegressionTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/RegressionTest.java
index 9feb18b..59f2346 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/RegressionTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/RegressionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2011, 2017 IBM Corporation, Zeligsoft Inc., 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/SerializationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/SerializationTest.java
index e233c8f..af786f8 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/SerializationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/SerializationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2009 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/StatesTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/StatesTest.java
index 322a956..5a4d3ba 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/StatesTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/StatesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/TuplesTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/TuplesTest.java
index 2652511..891d700 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/TuplesTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/TuplesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2006, 2012 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/TypesValidatorTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/TypesValidatorTest.java
index e5c6c30b..2bbe513 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/TypesValidatorTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/TypesValidatorTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 IBM Corporation, Zeligsoft Inc. 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLEnvironmentTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLEnvironmentTest.java
index 3d9d72b..7322030 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLEnvironmentTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLEnvironmentTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2010 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTest.java
index 43262ca..337cb6d 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestReflection.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestReflection.java
index 1c56708..357d912 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestReflection.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestReflection.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2012 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestSuite.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestSuite.java
index 59c33fc..0aaee01 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestSuite.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestSuite.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 Willink Transformations 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   E.D.Willink - Bug 254919; Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UtilitiesTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UtilitiesTest.java
index f049a75..f2a3cd2 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UtilitiesTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UtilitiesTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2007, 2011 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ValidationTest.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ValidationTest.java
index ef3afb6..edf3121 100644
--- a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ValidationTest.java
+++ b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/ValidationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation 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 v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation