diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.profile.standard/META-INF/MANIFEST.MF
index a245ffb..b381627 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml.profile.standard;singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.uml.profile.standard.StandardPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -13,5 +13,6 @@
  org.eclipse.uml2.uml.profile.standard.internal.operations,
  org.eclipse.uml2.uml.profile.standard.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)";visibility:=reexport
+ org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.uml2.uml.profile.standard
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/about.html b/plugins/org.eclipse.uml2.uml.profile.standard/about.html
index 598b368..1a90f7e 100755
--- a/plugins/org.eclipse.uml2.uml.profile.standard/about.html
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/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.uml2.uml.profile.standard/build.properties b/plugins/org.eclipse.uml2.uml.profile.standard/build.properties
index 7f97245..6dfaed4 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/build.properties
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/build.properties
@@ -1,11 +1,12 @@
-# Copyright (c) 2014 CEA and others.
+# Copyright (c) 2014, 2018 CEA and others.
 # All rights reserved.   This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which 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 (CEA) - initial API and implementation
+#   Kenn Hussey - 535301
 #
 source.. = src/
 output.. = bin/
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/plugin.properties b/plugins/org.eclipse.uml2.uml.profile.standard/plugin.properties
index b1cf6c9..9b97128 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/plugin.properties
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/plugin.properties
@@ -1,11 +1,12 @@
-# Copyright (c) 2011, 2014 CEA and others.
+# Copyright (c) 2011, 2018 CEA and others.
 # All rights reserved.   This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which 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 (CEA) - initial API and implementation
+#   Kenn Hussey - 535301
 #
 
 # NLS_MESSAGEFORMAT_VAR
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/plugin.xml b/plugins/org.eclipse.uml2.uml.profile.standard/plugin.xml
index fae42b7..2f11eab 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/plugin.xml
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/plugin.xml
@@ -2,14 +2,15 @@
 <?eclipse version="3.0"?>
 
 <!--
- Copyright (c) 2014 CEA and others.
+ Copyright (c) 2014, 2018 CEA and others.
  All rights reserved.   This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License v2.0
  which 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 (CEA) - initial API and implementation
+   Kenn Hussey - 535301
 
 -->
 
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Auxiliary.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Auxiliary.java
index ef5b988..5664c47 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Auxiliary.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Auxiliary.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/BuildComponent.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/BuildComponent.java
index f1f79f0..1c79f1d 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/BuildComponent.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/BuildComponent.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Call.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Call.java
index 1e86630..4ad6cd7 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Call.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Call.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Create.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Create.java
index 51e777f..b0945d9 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Create.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Create.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Derive.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Derive.java
index ab86de7..c5477a6 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Derive.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Derive.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Destroy.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Destroy.java
index a827c93..d442ae0 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Destroy.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Destroy.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Document.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Document.java
index a6aa3d5..f7c77bc 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Document.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Document.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Entity.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Entity.java
index 4aea15d..f98c246 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Entity.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Entity.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Executable.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Executable.java
index 5e6cb18..aa44c94 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Executable.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Executable.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/File.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/File.java
index 8f67e40..ce8d9a8 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/File.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/File.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Focus.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Focus.java
index 77ae552..2d57937 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Focus.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Focus.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Framework.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Framework.java
index ca144c2..f6a6b92 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Framework.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Framework.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Implement.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Implement.java
index 7deffb0..6b2ad13 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Implement.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Implement.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/ImplementationClass.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/ImplementationClass.java
index 4f326d5..dec1986 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/ImplementationClass.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/ImplementationClass.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Instantiate.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Instantiate.java
index 46e84b3..e7222e0 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Instantiate.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Instantiate.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Library.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Library.java
index 5e4074a..4367ff5 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Library.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Library.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Metaclass.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Metaclass.java
index 296334d..408140e 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Metaclass.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Metaclass.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Metamodel.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Metamodel.java
index 9a4b60f..cc09fc8 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Metamodel.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Metamodel.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/ModelLibrary.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/ModelLibrary.java
index f4345e2..9674db7 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/ModelLibrary.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/ModelLibrary.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Process.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Process.java
index 6df97aa..a62a3ca 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Process.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Process.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Realization.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Realization.java
index ed4d559..0b4f740 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Realization.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Realization.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Refine.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Refine.java
index 7736fb2..3f22686 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Refine.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Refine.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Responsibility.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Responsibility.java
index 0d30b40..2c6d0f8 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Responsibility.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Responsibility.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Script.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Script.java
index 12d4441..02ed7f7 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Script.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Script.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Send.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Send.java
index 1008c11..05a8abf 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Send.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Send.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Service.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Service.java
index 53c3c36..3b204a7 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Service.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Service.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Source.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Source.java
index 79142b8..f87e67c 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Source.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Source.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Specification.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Specification.java
index d4963d3..a5e0e79 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Specification.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Specification.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardFactory.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardFactory.java
index 95cb0d2..6ac18c5 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardFactory.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardFactory.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardPackage.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardPackage.java
index c6f1f1b..18acbc1 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardPackage.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardPackage.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 429994
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardPlugin.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardPlugin.java
index c714399..a37d590 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardPlugin.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/StandardPlugin.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Subsystem.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Subsystem.java
index c3eae58..1d8f890 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Subsystem.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Subsystem.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/SystemModel.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/SystemModel.java
index a5fb414..f965e72 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/SystemModel.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/SystemModel.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Trace.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Trace.java
index 77d7a6d..7ceaea7 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Trace.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Trace.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Type.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Type.java
index 0ed256f..f75362d 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Type.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Type.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Utility.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Utility.java
index 547c361..c0a68aa 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Utility.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Utility.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/AuxiliaryImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/AuxiliaryImpl.java
index 24ac6cd..5efd267 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/AuxiliaryImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/AuxiliaryImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/BuildComponentImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/BuildComponentImpl.java
index 632c099..94c20c8 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/BuildComponentImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/BuildComponentImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CallImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CallImpl.java
index 15b9e72..87a5097 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CallImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CallImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CreateImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CreateImpl.java
index 4fbafbc..da68b78 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CreateImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CreateImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DeriveImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DeriveImpl.java
index a828130..482be66 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DeriveImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DeriveImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DestroyImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DestroyImpl.java
index 09b11f4..89f925d 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DestroyImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DestroyImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DocumentImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DocumentImpl.java
index ab15d1b..84e60f3 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DocumentImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DocumentImpl.java
@@ -1,13 +1,14 @@
-/*
- * Copyright (c) 2014, 2015 CEA and others.
+/*8
+ * Copyright (c) 2014, 201 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/EntityImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/EntityImpl.java
index d8e50fa..e36e370 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/EntityImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/EntityImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ExecutableImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ExecutableImpl.java
index f7b76be..418c7ae 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ExecutableImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ExecutableImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FileImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FileImpl.java
index c89731e..3a44ed5 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FileImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FileImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FocusImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FocusImpl.java
index 5d41110..35c06d5 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FocusImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FocusImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FrameworkImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FrameworkImpl.java
index cd9ca8a..87925a6 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FrameworkImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FrameworkImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementImpl.java
index f9f7e7d..878cf37 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementationClassImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementationClassImpl.java
index c55726f..2ffc170 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementationClassImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementationClassImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/InstantiateImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/InstantiateImpl.java
index 862089c..d105dd3 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/InstantiateImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/InstantiateImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/LibraryImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/LibraryImpl.java
index e1d2c63..d73b5ce 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/LibraryImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/LibraryImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetaclassImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetaclassImpl.java
index dbc39a4..e134d8a 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetaclassImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetaclassImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetamodelImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetamodelImpl.java
index cd394da..2621296 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetamodelImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetamodelImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ModelLibraryImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ModelLibraryImpl.java
index 265eabd..097a2e3 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ModelLibraryImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ModelLibraryImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ProcessImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ProcessImpl.java
index 8a4f575..785d839 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ProcessImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ProcessImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/RealizationImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/RealizationImpl.java
index ce3d796..580bc2a 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/RealizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/RealizationImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/RefineImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/RefineImpl.java
index d769aed..e0d7c78 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/RefineImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/RefineImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ResponsibilityImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ResponsibilityImpl.java
index 4ba6ff8..ae432b6 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ResponsibilityImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ResponsibilityImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ScriptImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ScriptImpl.java
index decc785..9e68e92 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ScriptImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ScriptImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SendImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SendImpl.java
index 2057452..6e7b10e 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SendImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SendImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ServiceImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ServiceImpl.java
index 6676155..188d632 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ServiceImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ServiceImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SourceImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SourceImpl.java
index 33f94ad..e7eab11 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SourceImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SourceImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SpecificationImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SpecificationImpl.java
index f35b973..65d8f71 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SpecificationImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardFactoryImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardFactoryImpl.java
index 14abda1..2474e51 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardFactoryImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardFactoryImpl.java
@@ -1,12 +1,13 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardPackageImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardPackageImpl.java
index 3d2676e..448294b 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardPackageImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardPackageImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 429994
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SubsystemImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SubsystemImpl.java
index 9f277be..56effb4 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SubsystemImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SubsystemImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SystemModelImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SystemModelImpl.java
index 36b742b..91e00df 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SystemModelImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SystemModelImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TraceImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TraceImpl.java
index ce3bf7a..787a5ec 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TraceImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TraceImpl.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TypeImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TypeImpl.java
index d80ab56..13e4438 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TypeImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TypeImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/UtilityImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/UtilityImpl.java
index ed138e0..700f712 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/UtilityImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/UtilityImpl.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.impl;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CallOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CallOperations.java
index 852305e..4f988fa 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CallOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CallOperations.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CreateOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CreateOperations.java
index f296227..b677f7e 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CreateOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CreateOperations.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementOperations.java
index d4cca5d..022756a 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementOperations.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementationClassOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementationClassOperations.java
index 24a03f2..fea67df 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementationClassOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementationClassOperations.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/InstantiateOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/InstantiateOperations.java
index 8e03749..769d1c4 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/InstantiateOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/InstantiateOperations.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/RealizationOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/RealizationOperations.java
index d6dd061..873e07c 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/RealizationOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/RealizationOperations.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SendOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SendOperations.java
index d3f59fa..42c101e 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SendOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SendOperations.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SpecificationOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SpecificationOperations.java
index 3f14062..bf38945 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SpecificationOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SpecificationOperations.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/TypeOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/TypeOperations.java
index 9b68dbc..8b4c9ba 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/TypeOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/TypeOperations.java
@@ -1,13 +1,14 @@
 /*
  * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/UtilityOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/UtilityOperations.java
index 100dc8f..34c5f79 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/UtilityOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/UtilityOperations.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 351774, 418466
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.internal.operations;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardAdapterFactory.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardAdapterFactory.java
index ac78294..3c58188 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardAdapterFactory.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardAdapterFactory.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.util;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardSwitch.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardSwitch.java
index 265e98e..9cd7938 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardSwitch.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardSwitch.java
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
  *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.util;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardValidator.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardValidator.java
index 061ef1c..423cbc9 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardValidator.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardValidator.java
@@ -1,12 +1,13 @@
 /*
  * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which 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 (CEA) - initial API and implementation
+ *   Kenn Hussey - 535301
  *
  */
 package org.eclipse.uml2.uml.profile.standard.util;